summaryrefslogtreecommitdiff
path: root/x11-wm/spager/files/patch-aa
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm/spager/files/patch-aa')
-rw-r--r--x11-wm/spager/files/patch-aa27
1 files changed, 16 insertions, 11 deletions
diff --git a/x11-wm/spager/files/patch-aa b/x11-wm/spager/files/patch-aa
index ca0ebcef1ebf..3b5f598ce9d1 100644
--- a/x11-wm/spager/files/patch-aa
+++ b/x11-wm/spager/files/patch-aa
@@ -1,25 +1,30 @@
---- Makefile.orig Sat Feb 24 08:46:51 2001
-+++ Makefile Sun Apr 1 20:51:21 2001
-@@ -21,18 +21,18 @@
+--- Makefile.orig Thu May 24 01:32:54 2001
++++ Makefile Sat Aug 4 02:14:03 2001
+@@ -22,10 +22,10 @@
- # SAWFISH_CLIENT_LIB should point to client.a distributed with sawfish
--SAWFISH_CLIENT_LIB = /usr/lib/rep/i386-redhat-linux/sawfish/client.a
+ SAWFISH_CLIENT_LIB_DIR = `rep-config --execdir`/sawfish
-CC = gcc
-+SAWFISH_CLIENT_LIB =
-+CC ?= gcc
- CFLAGS =
++#CC = gcc
+-CFLAGS = -DUSE_SAWFISH_LIBCLIENT
+-LDFLAGS = -Wl,-rpath $(SAWFISH_CLIENT_LIB_DIR) $(SAWFISH_CLIENT_LIB_DIR)/client.so
++#CFLAGS = -DUSE_SAWFISH_LIBCLIENT
++#LDFLAGS = -Wl,-rpath $(SAWFISH_CLIENT_LIB_DIR) $(SAWFISH_CLIENT_LIB_DIR)/client.so
+ # To not use libclient directly comment out the two above lines and
+ #instead use the following lines:
+ # CFLAGS =
+@@ -34,11 +34,11 @@
all: spager spager.jlc merlin/message.jlc merlin/util.jlc
spager: spager.o
-- $(CC) -O6 -Wall spager.o $(SAWFISH_CLIENT_LIB) `gtk-config --libs` -o spager
-+ $(CC) -O6 -Wall spager.o $(SAWFISH_CLIENT_LIB) `gtk12-config --libs` -o spager
+- $(CC) -O6 -Wall spager.o $(LDFLAGS) `gtk-config --libs` -o spager
++ $(CC) -Wall spager.o $(LDFLAGS) `${GTK_CONFIG} --libs` -o spager
strip spager
spager.o: spager.c
- $(CC) -c -O6 -Wall $(CFLAGS) `gtk-config --cflags` spager.c
-+ $(CC) -c -O6 -Wall $(CFLAGS) `gtk12-config --cflags` spager.c
++ $(CC) -c -Wall $(CFLAGS) `${GTK_CONFIG} --cflags` spager.c
spager.jlc: spager.jl
sawfish --batch --no-rc compiler -f compile-batch $^