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

X Strike Force X.Org X11 SVN commit: r195 - trunk/debian



Author: branden
Date: 2005-06-13 12:41:12 -0500 (Mon, 13 Jun 2005)
New Revision: 195

Modified:
   trunk/debian/rules
Log:
Stop defining unused Make variable $(M4).

Copy the source tree to $(SOURCE_TREE)-xserver-xorg-dbg for the debugging
server build, not $(SOURCE_TREE)-xserver-xfree86-dbg.


Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2005-06-12 15:23:20 UTC (rev 194)
+++ trunk/debian/rules	2005-06-13 17:41:12 UTC (rev 195)
@@ -34,7 +34,6 @@
   include $(SCRIPT_DIR)/dpkg-arch.mk
 endif
 
-M4:=m4
 
 # This is a horrendous kludge to ensure that some scripts we need are executable.
 DUMMY:=$(shell if ! [ -x debian/setperms ]; then chmod 755 debian/setperms; fi)
@@ -247,7 +246,7 @@
 	ln -sf /usr/lib/libXft.* imports/lib
 ifndef NOT_BUILDING_XORG_X_SERVER
 	# Create source tree for static, debuggable Xorg server.
-	cp -drl $(SOURCE_TREE) $(SOURCE_TREE)-xserver-xfree86-dbg
+	cp -drl $(SOURCE_TREE) $(SOURCE_TREE)-xserver-xorg-dbg
 endif
 	# build Debian's X server wrapper
 	$(CC) -Wall -g -O2 -o debian/local/xserver-wrapper debian/local/xserver-wrapper.c



Reply to: