[NEW PATCH] Replace variable PREFIX with DESTDIR (via gerrit-bot)

Federico Simoncelli fsimonce at redhat.com
Wed Aug 3 12:28:00 UTC 2011


New patch submitted by Federico Simoncelli (fsimonce at redhat.com)

You can review this change at: http://gerrit.usersys.redhat.com/701

commit 12dc6ee8de6a1b00097e8285b4d2124935b95dce
Author: Federico Simoncelli <fsimonce at redhat.com>
Date:   Wed Jul 13 12:09:17 2011 +0000

    Replace variable PREFIX with DESTDIR
    
    Change-Id: I654d96512aabbbb13868bb485d09271e4345647f

diff --git a/vds_bootstrap/Makefile b/vds_bootstrap/Makefile
index b474b2a..76bf525 100644
--- a/vds_bootstrap/Makefile
+++ b/vds_bootstrap/Makefile
@@ -12,8 +12,8 @@ PYSRCS       = vds_bootstrap.py deployUtil.py vds_bootstrap_complete.py
 all: $(PYSRCS)
 
 install:
-	mkdir -p ${PREFIX}/$(TARGET)
-	cp ${PYSRCS} ${PREFIX}/$(TARGET)
+	mkdir -p $(DESTDIR)/$(TARGET)
+	cp $(PYSRCS) $(DESTDIR)/$(TARGET)
 
 clean:
 	$(RM) *.pyc *.pyo  *~
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 17318b3..51ef206 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -54,7 +54,7 @@ sed -i 's/^software_version =.*/software_version = "%{version}"/;s/software_revi
 %install
 rm -rf "%{buildroot}"
 mkdir -p "%{buildroot}"
-make -C vdsm PREFIX="%{buildroot}" \
+make -C vdsm DESTDIR="%{buildroot}" \
     VDSMDIR=%{_datadir}/%{vdsm_name} \
     VDSMLOGDIR=%{_localstatedir}/log/%{vdsm_name} \
     TRUSTSTORE=%{_sysconfdir}/pki/%{vdsm_name} \
@@ -68,17 +68,17 @@ make -C vdsm PREFIX="%{buildroot}" \
 mkdir -p "%{buildroot}"%{_localstatedir}/log/core
 
 # hook vhostmd
-make -C vdsm/hooks/vhostmd PREFIX="%{buildroot}" \
+make -C vdsm/hooks/vhostmd DESTDIR="%{buildroot}" \
     LIBEXECDIR=%{_libexecdir}/%{vdsm_name} \
     install
 
 # hook faqemu
-make -C vdsm/hooks/faqemu PREFIX="%{buildroot}" \
+make -C vdsm/hooks/faqemu DESTDIR="%{buildroot}" \
     LIBEXECDIR=%{_libexecdir}/%{vdsm_name} \
     install
 
 #vdsm-cli
-make -C vdsm_cli PREFIX="%{buildroot}" \
+make -C vdsm_cli DESTDIR="%{buildroot}" \
     CONFDIR=%{_sysconfdir}/%{vdsm_name} \
     BINDIR=%{_bindir} \
     COMPDIR=%{_sysconfdir}/bash_completion.d \
@@ -88,7 +88,7 @@ make -C vdsm_cli PREFIX="%{buildroot}" \
 
 #vdsm-reg
 make -C vdsm_reg \
-    PREFIX="%{buildroot}" \
+    DESTDIR="%{buildroot}" \
     ETC=%{_sysconfdir} \
     CONFDIR=%{_sysconfdir}/%{vdsm_reg} \
     LOGDIR=%{_localstatedir}/log/%{vdsm_reg} \
@@ -100,7 +100,7 @@ make -C vdsm_reg \
 
 #vdsm-bootstrap
 make -C vds_bootstrap \
-     PREFIX="%{buildroot}" \
+     DESTDIR="%{buildroot}" \
      TARGET=%{_datadir}/%{vdsm_bootstrap} install
 
 
diff --git a/vdsm/Makefile b/vdsm/Makefile
index 15088d0..515fec8 100644
--- a/vdsm/Makefile
+++ b/vdsm/Makefile
@@ -84,46 +84,46 @@ HOOKS=before_vm_start after_vm_start before_vm_cont after_vm_cont \
       before_vdsm_start after_vdsm_stop
 
 install: all sudoers.vdsm vdsm.conf.sample
-	mkdir -p $(PREFIX)$(VDSMDIR)
-	mkdir -p $(PREFIX)$(VDSMDIR)/storage
-	mkdir -p $(PREFIX)$(TRUSTSTORE)/{certs,keys}
-	mkdir -p $(PREFIX)$(VDSMLOGDIR)
-	mkdir -p $(PREFIX)$(VDSMRUNDIR)
-	mkdir -p $(PREFIX)$(VDSMLIBDIR)
-	mkdir -p $(PREFIX)$(VDSMLIBDIR)/netconfback
-	mkdir -p $(PREFIX)$(POOLSDATADIR)
-	mkdir -p $(PREFIX)$(BACKUPDIR)
-	mkdir -p $(PREFIX)$(BINDIR)
-	mkdir -p $(PREFIX)$(LIBEXECDIR)
-	(for hook in $(HOOKS); do mkdir -p $(PREFIX)$(LIBEXECDIR)/hooks/$$hook; done)
-	mkdir -p $(PREFIX)$(CONFDIR)
-	mkdir -p $(PREFIX)$(POOLDATADIR)
-	mkdir -p $(PREFIX)$(BACKUPDATADIR)
-	mkdir -p $(PREFIX)/etc/init.d/
-	mkdir -p $(PREFIX)/etc/udev/rules.d/
-	mkdir -p $(PREFIX)/var/lib/libvirt/qemu/channels/
-	cp $(FILES) $(PREFIX)$(VDSMDIR)
-	(cd storage; cp $(STORAGEFILES) $(PREFIX)$(VDSMDIR)/storage)
-	(cd storage; cp 12-vdsm-lvm.rules $(PREFIX)$(UDEVDIR))
-	cp logger.conf $(PREFIX)$(CONFDIR)
-	cp vdsmd $(PREFIX)/etc/init.d/vdsmd
-	(cd storage/protect; cp $(PROTECTFILES) $(PREFIX)$(LIBEXECDIR))
-	mkdir -p $(PREFIX)/etc/sudoers.d/
-	cp sudoers.vdsm $(PREFIX)/etc/sudoers.d/50_vdsm
-	mkdir -p $(PREFIX)/etc/logrotate.d
-	mkdir -p $(PREFIX)/etc/cron.hourly
-	mkdir -p $(PREFIX)/etc/cron.d
-	mkdir -p $(PREFIX)$(SOSPLUGINDIR)
-	cp -p vdsm-logrotate.conf $(PREFIX)/etc/logrotate.d/vdsm
-	cp -p vdsm-logrotate $(PREFIX)/etc/cron.hourly
-	cp -p vdsm-libvirt-logrotate $(PREFIX)/etc/cron.d
-	cp -p vdsm-sosplugin.py $(PREFIX)$(SOSPLUGINDIR)/vdsm.py
-	mkdir -p $(PREFIX)$(MANDIR)/man8
-	cp -p vdsmd.8 $(PREFIX)$(MANDIR)/man8/
-	mkdir -p $(PREFIX)/etc/rwtab.d/
-	cp -p vdsm.rwtab $(PREFIX)/etc/rwtab.d/vdsm
-	cp -p hooks/persist-vdsm-hooks $(PREFIX)$(LIBEXECDIR)
-	cp -p hooks/unpersist-vdsm-hook $(PREFIX)$(LIBEXECDIR)
+	mkdir -p $(DESTDIR)$(VDSMDIR)
+	mkdir -p $(DESTDIR)$(VDSMDIR)/storage
+	mkdir -p $(DESTDIR)$(TRUSTSTORE)/{certs,keys}
+	mkdir -p $(DESTDIR)$(VDSMLOGDIR)
+	mkdir -p $(DESTDIR)$(VDSMRUNDIR)
+	mkdir -p $(DESTDIR)$(VDSMLIBDIR)
+	mkdir -p $(DESTDIR)$(VDSMLIBDIR)/netconfback
+	mkdir -p $(DESTDIR)$(POOLSDATADIR)
+	mkdir -p $(DESTDIR)$(BACKUPDIR)
+	mkdir -p $(DESTDIR)$(BINDIR)
+	mkdir -p $(DESTDIR)$(LIBEXECDIR)
+	(for hook in $(HOOKS); do mkdir -p $(DESTDIR)$(LIBEXECDIR)/hooks/$$hook; done)
+	mkdir -p $(DESTDIR)$(CONFDIR)
+	mkdir -p $(DESTDIR)$(POOLDATADIR)
+	mkdir -p $(DESTDIR)$(BACKUPDATADIR)
+	mkdir -p $(DESTDIR)/etc/init.d/
+	mkdir -p $(DESTDIR)/etc/udev/rules.d/
+	mkdir -p $(DESTDIR)/var/lib/libvirt/qemu/channels/
+	cp $(FILES) $(DESTDIR)$(VDSMDIR)
+	(cd storage; cp $(STORAGEFILES) $(DESTDIR)$(VDSMDIR)/storage)
+	(cd storage; cp 12-vdsm-lvm.rules $(DESTDIR)$(UDEVDIR))
+	cp logger.conf $(DESTDIR)$(CONFDIR)
+	cp vdsmd $(DESTDIR)/etc/init.d/vdsmd
+	(cd storage/protect; cp $(PROTECTFILES) $(DESTDIR)$(LIBEXECDIR))
+	mkdir -p $(DESTDIR)/etc/sudoers.d/
+	cp sudoers.vdsm $(DESTDIR)/etc/sudoers.d/50_vdsm
+	mkdir -p $(DESTDIR)/etc/logrotate.d
+	mkdir -p $(DESTDIR)/etc/cron.hourly
+	mkdir -p $(DESTDIR)/etc/cron.d
+	mkdir -p $(DESTDIR)$(SOSPLUGINDIR)
+	cp -p vdsm-logrotate.conf $(DESTDIR)/etc/logrotate.d/vdsm
+	cp -p vdsm-logrotate $(DESTDIR)/etc/cron.hourly
+	cp -p vdsm-libvirt-logrotate $(DESTDIR)/etc/cron.d
+	cp -p vdsm-sosplugin.py $(DESTDIR)$(SOSPLUGINDIR)/vdsm.py
+	mkdir -p $(DESTDIR)$(MANDIR)/man8
+	cp -p vdsmd.8 $(DESTDIR)$(MANDIR)/man8/
+	mkdir -p $(DESTDIR)/etc/rwtab.d/
+	cp -p vdsm.rwtab $(DESTDIR)/etc/rwtab.d/vdsm
+	cp -p hooks/persist-vdsm-hooks $(DESTDIR)$(LIBEXECDIR)
+	cp -p hooks/unpersist-vdsm-hook $(DESTDIR)$(LIBEXECDIR)
 
 clean:
 	$(RM) *~ *.pyc storage/protect/safelease vdsm.conf.sample
diff --git a/vdsm/hooks/faqemu/Makefile b/vdsm/hooks/faqemu/Makefile
index 57ae138..00ee2f5 100644
--- a/vdsm/hooks/faqemu/Makefile
+++ b/vdsm/hooks/faqemu/Makefile
@@ -3,11 +3,11 @@ LIBEXECDIR=/usr/libexec/vdsm
 HOOKSDIR=$(LIBEXECDIR)/hooks
 
 install:
-	install -d $(PREFIX)$(BINDIR)
-	install -m 755 qemu $(PREFIX)$(BINDIR)
-	ln -sf qemu $(PREFIX)$(BINDIR)/qemu-system-x86_64
-	install -d $(PREFIX)$(HOOKSDIR)/before_vm_start
-	install -m 755 before_vm_start.py $(PREFIX)$(HOOKSDIR)/before_vm_start/10_faqemu
+	install -d $(DESTDIR)$(BINDIR)
+	install -m 755 qemu $(DESTDIR)$(BINDIR)
+	ln -sf qemu $(DESTDIR)$(BINDIR)/qemu-system-x86_64
+	install -d $(DESTDIR)$(HOOKSDIR)/before_vm_start
+	install -m 755 before_vm_start.py $(DESTDIR)$(HOOKSDIR)/before_vm_start/10_faqemu
 
 clean:
 	$(RM) *~ *.pyc
diff --git a/vdsm/hooks/vhostmd/Makefile b/vdsm/hooks/vhostmd/Makefile
index 33856e7..2efc7ce 100644
--- a/vdsm/hooks/vhostmd/Makefile
+++ b/vdsm/hooks/vhostmd/Makefile
@@ -4,13 +4,13 @@ HOOKSDIR=$(LIBEXECDIR)/hooks
 all:
 
 install:
-	mkdir -p $(PREFIX)$(HOOKSDIR)/{before_vm_start,after_vm_destroy}
-	cp before_vm_start.py $(PREFIX)$(HOOKSDIR)/before_vm_start/50_vhostmd
-	ln -s ../before_vm_start/50_vhostmd $(PREFIX)$(HOOKSDIR)/before_vm_migrate_destination/50_vhostmd
-	ln -s ../before_vm_start/50_vhostmd $(PREFIX)$(HOOKSDIR)/before_vm_dehibernate/50_vhostmd
-	cp after_vm_destroy.py $(PREFIX)$(HOOKSDIR)/after_vm_destroy/50_vhostmd
-	mkdir -p $(PREFIX)/etc/sudoers.d/
-	cp sudoers.vdsm_hook_vhostmd $(PREFIX)/etc/sudoers.d/50_vdsm_hook_vhostmd
+	mkdir -p $(DESTDIR)$(HOOKSDIR)/{before_vm_start,after_vm_destroy}
+	cp before_vm_start.py $(DESTDIR)$(HOOKSDIR)/before_vm_start/50_vhostmd
+	ln -s ../before_vm_start/50_vhostmd $(DESTDIR)$(HOOKSDIR)/before_vm_migrate_destination/50_vhostmd
+	ln -s ../before_vm_start/50_vhostmd $(DESTDIR)$(HOOKSDIR)/before_vm_dehibernate/50_vhostmd
+	cp after_vm_destroy.py $(DESTDIR)$(HOOKSDIR)/after_vm_destroy/50_vhostmd
+	mkdir -p $(DESTDIR)/etc/sudoers.d/
+	cp sudoers.vdsm_hook_vhostmd $(DESTDIR)/etc/sudoers.d/50_vdsm_hook_vhostmd
 
 clean:
 	$(RM) *~ *.pyc
diff --git a/vdsm_cli/Makefile b/vdsm_cli/Makefile
index 17e8467..65b22cc 100644
--- a/vdsm_cli/Makefile
+++ b/vdsm_cli/Makefile
@@ -21,14 +21,14 @@ fixpaths:
 	sed -i "s:@TRUSTSTORE@:$(TRUSTSTORE):" vdscli.py
 
 install: fixpaths
-	mkdir -p ${PREFIX}/$(TARGET)
-	cp ${PYSRCS} ${PREFIX}/$(TARGET)
-	mkdir -p $(PREFIX)/$(BINDIR)
-	cp vdsClient $(PREFIX)/$(BINDIR)
-	mkdir -p $(PREFIX)/$(COMPDIR)
-	cp vdsClient.completion $(PREFIX)$(COMPDIR)/vdsClient
-	mkdir -p $(PREFIX)$(MANDIR)/man1
-	cp vdsClient.1 $(PREFIX)$(MANDIR)/man1/
+	mkdir -p $(DESTDIR)/$(TARGET)
+	cp $(PYSRCS) $(DESTDIR)/$(TARGET)
+	mkdir -p $(DESTDIR)/$(BINDIR)
+	cp vdsClient $(DESTDIR)/$(BINDIR)
+	mkdir -p $(DESTDIR)/$(COMPDIR)
+	cp vdsClient.completion $(DESTDIR)$(COMPDIR)/vdsClient
+	mkdir -p $(DESTDIR)$(MANDIR)/man1
+	cp vdsClient.1 $(DESTDIR)$(MANDIR)/man1/
 
 clean:
 	$(RM) *~ *.pyc
diff --git a/vdsm_reg/Makefile b/vdsm_reg/Makefile
index d1d5d75..ce1d247 100644
--- a/vdsm_reg/Makefile
+++ b/vdsm_reg/Makefile
@@ -13,23 +13,23 @@ fixpaths:
 	sed -i "s:@VDSMRUNDIR@:$(VDSMRUNDIR):" vdsm-reg.conf
 
 install: fixpaths
-	mkdir -p $(PREFIX)$(CONFDIR)
-	mkdir -p $(PREFIX)$(VDSMREGDIR)
-	mkdir -p $(PREFIX)$(ETC)/ovirt-config-setup.d/
-	mkdir -p $(PREFIX)$(ETC)/ovirt-config-boot.d/
-	mkdir -p $(PREFIX)$(LOGDIR)
-	mkdir -p $(PREFIX)$(OVIRT_CONFIG_SETUP)
+	mkdir -p $(DESTDIR)$(CONFDIR)
+	mkdir -p $(DESTDIR)$(VDSMREGDIR)
+	mkdir -p $(DESTDIR)$(ETC)/ovirt-config-setup.d/
+	mkdir -p $(DESTDIR)$(ETC)/ovirt-config-boot.d/
+	mkdir -p $(DESTDIR)$(LOGDIR)
+	mkdir -p $(DESTDIR)$(OVIRT_CONFIG_SETUP)
 	
-	cp -p vdsm-reg $(PREFIX)$(ETC)/init.d
-	cp -p {logger.conf,vdsm-reg.conf} $(PREFIX)$(CONFDIR)
-	cp -p define.py config.py save-config deployUtil.py createDaemon.py $(PREFIX)$(VDSMREGDIR)
-	cp -p vdsm-reg-setup.py $(PREFIX)$(VDSMREGDIR)/vdsm-reg-setup
-	cp -p vdsm-gen-cert.py $(PREFIX)$(VDSMREGDIR)/vdsm-gen-cert
-	cp -p vdsm-complete.py $(PREFIX)$(VDSMREGDIR)/vdsm-complete
-	cp -p vdsm-upgrade.py $(PREFIX)$(VDSMREGDIR)/vdsm-upgrade
-	cp -p vdsm-config $(PREFIX)$(ETC)/ovirt-config-boot.d
-	cp -p vdsm-reg-logrotate.conf $(PREFIX)$(ETC)/logrotate.d/vdsm-reg
-	cp -p vdsm-reg-logrotate $(PREFIX)$(ETC)/cron.hourly
-	mkdir -p $(PREFIX)$(MANDIR)/man8
-	cp -p vdsm-reg.8 $(PREFIX)$(MANDIR)/man8/
-	cp -p rhevm.py $(PREFIX)$(OVIRT_CONFIG_SETUP)
+	cp -p vdsm-reg $(DESTDIR)$(ETC)/init.d
+	cp -p {logger.conf,vdsm-reg.conf} $(DESTDIR)$(CONFDIR)
+	cp -p define.py config.py save-config deployUtil.py createDaemon.py $(DESTDIR)$(VDSMREGDIR)
+	cp -p vdsm-reg-setup.py $(DESTDIR)$(VDSMREGDIR)/vdsm-reg-setup
+	cp -p vdsm-gen-cert.py $(DESTDIR)$(VDSMREGDIR)/vdsm-gen-cert
+	cp -p vdsm-complete.py $(DESTDIR)$(VDSMREGDIR)/vdsm-complete
+	cp -p vdsm-upgrade.py $(DESTDIR)$(VDSMREGDIR)/vdsm-upgrade
+	cp -p vdsm-config $(DESTDIR)$(ETC)/ovirt-config-boot.d
+	cp -p vdsm-reg-logrotate.conf $(DESTDIR)$(ETC)/logrotate.d/vdsm-reg
+	cp -p vdsm-reg-logrotate $(DESTDIR)$(ETC)/cron.hourly
+	mkdir -p $(DESTDIR)$(MANDIR)/man8
+	cp -p vdsm-reg.8 $(DESTDIR)$(MANDIR)/man8/
+	cp -p rhevm.py $(DESTDIR)$(OVIRT_CONFIG_SETUP)




More information about the vdsm-patches mailing list