Changeset 35936 in vbox for trunk/src/VBox/Installer/linux/rpm

Timestamp:

Feb 11, 2011 8:06:56 AM (14 years ago)

Author:

vboxsync

Message:

deb/rpm: allow to overwrite pkgdir

File:

• trunk/src/VBox/Installer/linux/rpm/rules (modified) (2 diffs)

trunk/src/VBox/Installer/linux/rpm/rules

@@ -33 +33 @@
 current  := $(shell pwd)
 vboxroot := $(shell cd ../../../../; pwd)
-pkgdir   := $(shell cd ../../../../..; pwd)
+pkgdir   := $(if $(PKGDIR),$(PKGDIR),$(shell cd ../../../../..; pwd))
 builddir := $(current)/rpm/builddir
 rpmlib   := $(shell if [ `uname -m` = "x86_64" ]; then echo "lib64"; else echo "lib"; fi)
@@ -188 +188 @@
         rm -f /usr/src/packages/SPECS/*
         rpmbuild -tb --clean rpm/VirtualBox.tar.bz2
-        mv /usr/src/packages/RPMS/*/$(verpkg)-debug* $(vboxroot)/.. || true
+        mv /usr/src/packages/RPMS/*/$(verpkg)-debug* $(pkgdir) || true
         file=`find /usr/src/packages/RPMS -name $(verpkg)*rpm -print`; \
             mv $$file $(pkgdir)