diff options
Diffstat (limited to 'x11-wm/ion-2/files/patch-system.mk')
| -rw-r--r-- | x11-wm/ion-2/files/patch-system.mk | 104 |
1 files changed, 65 insertions, 39 deletions
diff --git a/x11-wm/ion-2/files/patch-system.mk b/x11-wm/ion-2/files/patch-system.mk index e08a035fd705..d7fb284debd6 100644 --- a/x11-wm/ion-2/files/patch-system.mk +++ b/x11-wm/ion-2/files/patch-system.mk @@ -1,46 +1,71 @@ ---- system.mk.orig Sat Jan 19 15:15:13 2002 -+++ system.mk Mon Mar 15 03:19:42 2004 -@@ -7,13 +7,13 @@ +--- system.mk.orig Wed Apr 7 09:15:54 2004 ++++ system.mk Tue May 25 16:54:31 2004 +@@ -7,7 +7,7 @@ ## Installation paths ## -PREFIX=/usr/local +#PREFIX=/usr/local - # No need to modify these usually - BINDIR=$(PREFIX)/bin - ETCDIR=$(PREFIX)/etc - MANDIR=$(PREFIX)/man --DOCDIR=$(PREFIX)/doc -+DOCDIR=$(PREFIX)/share/doc - # Not used - INCDIR=$(PREFIX)/include - LIBDIR=$(PREFIX)/lib -@@ -24,14 +24,14 @@ - ## - - #MODULE_SUPPORT=-DCF_NO_MODULE_SUPPORT --MODULE_SUPPORT_LDFLAGS=-export-dynamic -ldl -+MODULE_SUPPORT_LDFLAGS=-export-dynamic - - - ## + # Unless you are creating a package conforming to some OS's standards, you + # probably do not want to modify the following directories: +@@ -19,7 +19,7 @@ + # Some .lua files and ion-* shell scripts + SHAREDIR=$(PREFIX)/share/ion + # Manual pages +-MANDIR=$(PREFIX)/share/man ++MANDIR=$(PREFIX)/man + # Some documents + DOCDIR=$(PREFIX)/share/doc/ion + # Nothing at the moment +@@ -42,11 +42,11 @@ + # libtool because even more-recent-than-libtool-1.4.3 releases of those + # OSes only have an _ancient_ 1.3.x libtool that _will_ _not_ _work even + # though a lot of libltdl-using apps require 1.4.3. +-LIBTOOL=libtool ++LIBTOOL=$(LOCALBASE)/bin/libtool15 --tag=CC + + # Settings for compiling and linking to ltdl +-LTDL_INCLUDES= +-LTDL_LIBS=-lltdl ++LTDL_INCLUDES=-I$(LOCALBASE)/include ++LTDL_LIBS=-L$(LOCALBASE)/lib -lltdl + + # The following should do it if you have manually installed libtool 1.5 in + # $(LIBTOOLDIR). +@@ -72,7 +72,7 @@ + + # If you have installed Lua 5.0 from the official tarball without changing + # paths, this should do it. +-LUA_DIR=/usr/local ++LUA_DIR=$(LOCALBASE) + LUA_LIBS = -L$(LUA_DIR)/lib -R$(LUA_DIR)/lib -llua -llualib + LUA_INCLUDES = -I$(LUA_DIR)/include + LUA=$(LUA_DIR)/bin/lua +@@ -90,7 +90,7 @@ ## X libraries, includes and options ## -X11_PREFIX=/usr/X11R6 +X11_PREFIX=$(X11BASE) - # SunOS/Solaris #X11_PREFIX=/usr/openwin -@@ -52,14 +52,14 @@ + +@@ -119,29 +119,29 @@ # asprintf and vasprintf in the c library. (gnu libc has.) # If HAS_SYSTEM_ASPRINTF is not defined, an implementation - # in libtu/sprintf_2.2/ is used. + # in sprintf_2.2/ is used. -#HAS_SYSTEM_ASPRINTF=1 +HAS_SYSTEM_ASPRINTF=1 + # If you're on an archaic system (such as relatively recent *BSD releases) + # without even dummy multibyte/widechar support, you may have to uncomment + # the following line: +-#DEFINES += -DCF_NO_MB_SUPPORT ++DEFINES += -DCF_NO_MB_SUPPORT + + ## ## C compiler ## @@ -48,24 +73,30 @@ -CC=gcc +CC?=gcc - # The POSIX_SOURCE, XOPEN_SOURCE and WARN options should not be necessary, - # they're mainly for development use. So, if they cause trouble (not -@@ -83,11 +83,11 @@ + # Same as '-Wall -pedantic' without '-Wunused' as callbacks often # have unused variables. WARN= -W -Wimplicit -Wreturn-type -Wswitch -Wcomment \ -Wtrigraphs -Wformat -Wchar-subscripts \ -- -Wparentheses -pedantic-errors -Wuninitialized +- -Wparentheses -pedantic -Wuninitialized + -Wparentheses -Wuninitialized +-CFLAGS=-g -Os $(WARN) $(DEFINES) $(EXTRA_INCLUDES) $(INCLUDES) +-LDFLAGS=-g -Os $(EXTRA_LIBS) $(LIBS) ++CFLAGS+= $(WARN) $(DEFINES) $(EXTRA_INCLUDES) $(INCLUDES) ++LDFLAGS= $(EXTRA_LIBS) $(LIBS) --CFLAGS=-g -O2 $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) --LDFLAGS=-g $(LIBS) $(EXTRA_LIBS) -+CFLAGS+= $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -+LDFLAGS= $(LIBS) $(EXTRA_LIBS) + # The following options are mainly for development use and can be used + # to check that the code seems to conform to some standards. Depending +@@ -154,7 +154,7 @@ + #POSIX_SOURCE=-D_POSIX_SOURCE + # Most systems +-#XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED ++XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED + # SunOS, (Irix) + #XOPEN_SOURCE=-D__EXTENSIONS__ - ## -@@ -112,13 +112,13 @@ +@@ -190,9 +190,9 @@ ## # Should work almost everywhere @@ -77,8 +108,3 @@ INSTALLDIR=mkdir -p - BIN_MODE=755 --DATA_MODE=664 -+DATA_MODE=644 - - STRIP=strip |