summaryrefslogtreecommitdiff
path: root/graphics/xpaint/patches/patch-ag
blob: 78c7058ef79f37284f386d4329af1d4d858c9819 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
$NetBSD: patch-ag,v 1.5 2004/11/03 15:54:31 adam Exp $

--- Imakefile.orig	2004-09-03 07:19:00.000000000 +0000
+++ Imakefile
@@ -97,7 +97,7 @@ SGI_LIB = -limage
 #endif
 
 DEPLIBS = always xpaint.man XPaint.ad
-LOCAL_LIBRARIES = -Lrw -lrw $(XPM_LIB) $(TIFF_LIB) $(SGI_LIB) $(JPEG_LIB) $(PNG_LIB) -ldl -rdynamic
+LOCAL_LIBRARIES = -Lrw -lrw $(XPM_LIB) $(TIFF_LIB) $(SGI_LIB) $(JPEG_LIB) $(PNG_LIB)
 
 SUBDIRS = rw
 
@@ -133,10 +133,10 @@ install::
 xaw::
 	-$(RM) $(XAW95DEPENDS)
 	echo "SYS_LIBRARIES = XawClientLibs -lm" > Local.xawdefs
-	xmkmf ; make
+	${XMKMF} ; ${MAKE}
 
 libXaw95.so:
-	cd xaw95-1.1.4 ; xmkmf -a ; make
+	cd xaw95-1.1.4 ; ${XMKMF} ; ${MAKE}
 	-$(RM) libXaw95.so libXaw95.a
 	-$(LN) xaw95-1.1.4/libXaw95.so libXaw95.so
 	-$(LN) xaw95-1.1.4/libXaw95.a libXaw95.a
@@ -147,13 +147,13 @@ xaw95:: libXaw95.so
 	-$(RM) $(XAW95DEPENDS)
 	echo "XAWLIB_DEFINES = -DXAW95" > Local.xawdefs
 	echo "SYS_LIBRARIES = -lXaw95 -L." >> Local.xawdefs
-	xmkmf ; make
+	${XMKMF} ; ${MAKE}
 
 xaw95static:: libXaw95.a
 	-$(RM) $(XAW95DEPENDS)
 	echo "XAWLIB_DEFINES = -DXAW95" > Local.xawdefs
-	echo "SYS_LIBRARIES = ./libXaw95.a -lm -lX11 -lXt -lXmu" >> Local.xawdefs
-	xmkmf ; make
+	echo "SYS_LIBRARIES = ./xaw95-1.1.4/libXaw95.a -lm -lX11 -lXt -lXmu" >> Local.xawdefs
+	${XMKMF} ; ${MAKE}
 
 clean::
 	-$(RM) preproc substads XPaint.ad XPaint.ad.h DefaultRC.txt.h PGP.*
@@ -162,7 +162,7 @@ clean::
 	cd share/messages ; $(RM) *~
 	cd app-defaults ; $(RM) core *~ substads
 	cd app-defaults/out ; $(RM) -f Xpaint*
-	cd xaw95-1.1.4 ; if [ -r Makefile ] ; then make clean ; fi
+	cd xaw95-1.1.4 ; if [ -r Makefile ] ; then ${MAKE} clean ; fi
 
 includes:: XPaint.ad.h DefaultRC.txt.h messages.h
 	cd bitmaps; $(RM) tools; \