summaryrefslogtreecommitdiff
path: root/lang/icon/patches/patch-aw
blob: afca1bed9c0025c7a84584fefed4febe485fea61 (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
$NetBSD: patch-aw,v 1.4 2003/03/24 12:12:10 jtb Exp $

--- src/common/Makefile.orig	Wed Dec 12 18:28:10 2001
+++ src/common/Makefile
@@ -5,7 +5,7 @@ OBJS =	long.o getopt.o time.o filepart.o
 	munix.o literals.o rswitch.o alloc.o long.o getopt.o time.o\
 	save.o redirerr.o xwindow.o dlrgint.o ipp.o
 
-common:		doincl patchstr $(OBJS) xpmaybe
+common:		doincl patchstr $(OBJS) fixheaders xpmaybe
 
 doincl:		doincl.c ../h/arch.h
 		$(CC) $(CFLAGS) -o doincl doincl.c
@@ -15,12 +15,20 @@ patchstr:	patchstr.c
 		$(CC) $(CFLAGS) -o patchstr patchstr.c
 		cp patchstr ../../bin
 
+fixheaders:
+		cd ../h; for f in *.h; do							\
+		sed -e 's:../h/::g;s:../xpm/::g' $$f > ../../lib/icon/$$f;			\
+		done
+
 xpmaybe:
 		-if [ "x$(XL)" != "x" ]; then $(MAKE) xpm; fi
 
 xpm:
 		cd ../xpm; $(MAKE) libXpm.a
-		cp ../xpm/libXpm.a ../../bin
+		cp ../xpm/libXpm.a ../../lib/icon
+		cd ../xpm; for f in *.h; do							\
+		sed -e 's:../h/::g;s:../xpm/::g' $$f >	../../lib/icon/$$f;			\
+		done
 
 $(OBJS): ../h/define.h ../h/arch.h ../h/config.h ../h/cstructs.h ../h/mproto.h \
 	  ../h/typedefs.h ../h/proto.h ../h/cpuconf.h