X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=debian%2Fpatches%2F201_build-config.diff;h=97d2186eba17be5b56b68e1c60908633059bdcd1;hb=HEAD;hp=c58cdf2c8c08e6806102886619d01218a288585c;hpb=37f68ca2ed7d9a31bc96d0a3bf91009b3901bada;p=ion3.git

diff --git a/debian/patches/201_build-config.diff b/debian/patches/201_build-config.diff
old mode 100755
new mode 100644
index c58cdf2..97d2186
--- a/debian/patches/201_build-config.diff
+++ b/debian/patches/201_build-config.diff
@@ -1,5 +1,7 @@
---- ion3.orig/system.mk
-+++ ion3/system.mk
+Index: ion3-20080707/system.mk
+===================================================================
+--- ion3-20080707.orig/system.mk	2008-07-07 16:39:16.000000000 +0100
++++ ion3-20080707/system.mk	2008-07-11 00:31:29.000000000 +0100
 @@ -8,7 +8,7 @@
  
  # Installation path prefix. Unless you know what you're doing, the default
@@ -32,7 +34,7 @@
  # For ion-completeman system-wide cache
  VARDIR=/var/cache/ion3
  # Message catalogs
-@@ -59,18 +59,18 @@
+@@ -62,18 +62,18 @@
  
  # If you have installed Lua 5.1 from the official tarball without changing
  # paths, this should do it.
@@ -60,7 +62,7 @@
  
  
  ##
-@@ -124,7 +124,7 @@
+@@ -127,7 +127,7 @@
  # You may uncomment this if you know that your system C libary provides
  # asprintf and  vasprintf. (GNU libc does.) If HAS_SYSTEM_ASPRINTF is not
  # defined, an implementation provided in libtu/sprintf_2.2/ is used. 
@@ -69,12 +71,8 @@
  
  # The following setting is needed with GNU libc for clock_gettime and the
  # monotonic clock. Other systems may not need it, or may not provide a
-@@ -163,14 +163,14 @@
- 
- #C89_SOURCE=-ansi
- 
--#POSIX_SOURCE=-D_POSIX_C_SOURCE=200112L
-+POSIX_SOURCE=-D_POSIX_C_SOURCE=200112L
+@@ -172,11 +172,11 @@
+ POSIX_SOURCE=-D_POSIX_C_SOURCE=200112L
  
  # Most systems
 -#XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED
@@ -87,14 +85,3 @@
  
  # The -DCF_HAS_VA_COPY option should allow for some optimisations, and 
  # in some cases simply defining
---- ion3.orig/utils/ion-statusd/Makefile
-+++ ion3/utils/ion-statusd/Makefile
-@@ -15,7 +15,7 @@
- DEFINES += -DETCDIR=\"$(ETCDIR)\" -DSHAREDIR=\"$(SHAREDIR)\" \
-            -DEXTRABINDIR=\"$(EXTRABINDIR)\" -DMODULEDIR=\"$(MODULEDIR)\" \
- 	   -DLCDIR=\"$(LCDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\" \
--           -DSTATUSD_LOCATION=\"$(EXTRABINDIR)/ion-statusd\"
-+#           -DSTATUSD_LOCATION=\"$(EXTRABINDIR)/ion-statusd\"
-            
- SOURCES = ion-statusd.c exec.c extlrx.c
-