[med-svn] r4676 - in trunk/packages/arb/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2010-03-23 15:19:59 +0000 (Tue, 23 Mar 2010)
New Revision: 4676

Modified:
   trunk/packages/arb/trunk/debian/patches/30_Makefile_main
   trunk/packages/arb/trunk/debian/rules
Log:
More gcc-4.4.3 patches


Modified: trunk/packages/arb/trunk/debian/patches/30_Makefile_main
===================================================================
--- trunk/packages/arb/trunk/debian/patches/30_Makefile_main	2010-03-23 14:31:37 UTC (rev 4675)
+++ trunk/packages/arb/trunk/debian/patches/30_Makefile_main	2010-03-23 15:19:59 UTC (rev 4676)
@@ -1,5 +1,5 @@
---- arb-5.0.orig/Makefile
-+++ arb-5.0/Makefile
+--- arbsrc_6213.orig/Makefile
++++ arbsrc_6213/Makefile
 @@ -57,7 +57,8 @@
  	4.0.0 4.0.1 4.0.2 4.0.3 \
  	4.1.1 4.1.2 4.1.3 \
@@ -20,12 +20,16 @@
  extended_warnings :=# warning flags for C and C++-compiler
  extended_cpp_warnings :=# warning flags for C++-compiler only
  
-@@ -198,7 +200,7 @@
+@@ -198,7 +200,11 @@
  
  #---------------------- X11 location
  
 -XHOME:=/usr/X11R6
-+XHOME:=/usr
++ifdef DEBIAN
++	XHOME:=/usr
++else
++	XHOME:=/usr/X11R6
++endif
  XINCLUDES:=-I$(XHOME)/include
  
  ifdef DARWIN

Modified: trunk/packages/arb/trunk/debian/rules
===================================================================
--- trunk/packages/arb/trunk/debian/rules	2010-03-23 14:31:37 UTC (rev 4675)
+++ trunk/packages/arb/trunk/debian/rules	2010-03-23 15:19:59 UTC (rev 4676)
@@ -23,12 +23,12 @@
 	export LC_ALL=C ; \
 	export PATH=$${ARBHOME}/bin:$${PATH} ; \
 	export LD_LIBRARY_PATH=$${ARBHOME}/lib:$${LD_LIBRARY_PATH}; \
-	  $(MAKE) DEBIAN=1 all
+	  $(MAKE) DEBIAN=1 ARBHOME=$${ARBHOME} all
 	export ARBHOME=`pwd` ; \
 	export LC_ALL=C ; \
 	export PATH=$${ARBHOME}/bin:$${PATH} ; \
 	export LD_LIBRARY_PATH=$${ARBHOME}/lib:$${LD_LIBRARY_PATH}; \
-	  $(MAKE) DEBIAN=1 arbxtras
+	  $(MAKE) DEBIAN=1 ARBHOME=$${ARBHOME} arbxtras
 
 	touch $@