[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r887 - in branches/modular/lib: SM/debian Xaw/libxaw-0.99.1/debian dmx/debian fontenc/debian



Author: dnusinow
Date: 2005-11-15 20:49:50 -0500 (Tue, 15 Nov 2005)
New Revision: 887

Modified:
   branches/modular/lib/SM/debian/rules
   branches/modular/lib/Xaw/libxaw-0.99.1/debian/rules
   branches/modular/lib/dmx/debian/rules
   branches/modular/lib/fontenc/debian/rules
Log:
Remove crappy changes with ROOTDIR that I made previously in ignorance.

Modified: branches/modular/lib/SM/debian/rules
===================================================================
--- branches/modular/lib/SM/debian/rules	2005-11-16 01:30:49 UTC (rev 886)
+++ branches/modular/lib/SM/debian/rules	2005-11-16 01:49:50 UTC (rev 887)
@@ -9,7 +9,6 @@
 
 # set this to the name of the main shlib's binary package
 PACKAGE = libxau6
-ROOTDIR = $(shell pwd)
 
 include debian/xsfbs/xsfbs.mk
 
@@ -65,7 +64,7 @@
 	dh_clean -k
 	dh_installdirs
 
-	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(ROOTDIR)/debian/tmp install
+	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
 # Build architecture-dependent files here.
 binary-arch: build install

Modified: branches/modular/lib/Xaw/libxaw-0.99.1/debian/rules
===================================================================
--- branches/modular/lib/Xaw/libxaw-0.99.1/debian/rules	2005-11-16 01:30:49 UTC (rev 886)
+++ branches/modular/lib/Xaw/libxaw-0.99.1/debian/rules	2005-11-16 01:49:50 UTC (rev 887)
@@ -7,7 +7,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-ROOTDIR = $(shell pwd)
 
 include debian/xsfbs/xsfbs.mk
 
@@ -63,7 +62,7 @@
 	dh_clean -k
 	dh_installdirs
 
-	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(ROOTDIR)/debian/tmp install
+	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
 # Build architecture-dependent files here.
 binary-arch: build install

Modified: branches/modular/lib/dmx/debian/rules
===================================================================
--- branches/modular/lib/dmx/debian/rules	2005-11-16 01:30:49 UTC (rev 886)
+++ branches/modular/lib/dmx/debian/rules	2005-11-16 01:49:50 UTC (rev 887)
@@ -9,7 +9,6 @@
 
 # set this to the name of the main shlib's binary package
 PACKAGE = libdmx1
-ROOTDIR = $(shell pwd)
 
 include debian/xsfbs/xsfbs.mk
 
@@ -65,7 +64,7 @@
 	dh_clean -k
 	dh_installdirs
 
-	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(ROOTDIR)/debian/tmp install
+	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
 # Build architecture-dependent files here.
 binary-arch: build install

Modified: branches/modular/lib/fontenc/debian/rules
===================================================================
--- branches/modular/lib/fontenc/debian/rules	2005-11-16 01:30:49 UTC (rev 886)
+++ branches/modular/lib/fontenc/debian/rules	2005-11-16 01:49:50 UTC (rev 887)
@@ -9,7 +9,6 @@
 
 # set this to the name of the main shlib's binary package
 PACKAGE = libfontenc1
-ROOTDIR = $(shell pwd)
 
 include debian/xsfbs/xsfbs.mk
 
@@ -65,7 +64,7 @@
 	dh_clean -k
 	dh_installdirs
 
-	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(ROOTDIR)/debian/tmp install
+	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
 # Build architecture-dependent files here.
 binary-arch: build install



Reply to: