summaryrefslogtreecommitdiff
path: root/archivers/nulib2/patches/patch-ab
blob: 7ea9c607c693e96c76d4cb15422f7e61aa4c932b (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-ab,v 1.2 2001/07/16 10:09:45 jlam Exp $

--- Makefile.in.orig	Mon May 22 20:42:57 2000
+++ Makefile.in
@@ -38,7 +38,7 @@
 #OPT 		= @CFLAGS@ -DDEBUG_MSGS
 #OPT 		= @CFLAGS@ -DDEBUG_VERBOSE
 GCC_FLAGS	= -Wall -Wwrite-strings -Wstrict-prototypes -Wpointer-arith -Wshadow
-CFLAGS		= @BUILD_FLAGS@ -I. -I$(NUFXSRCDIR) -I$(includedir) @DEFS@
+CFLAGS		= @BUILD_FLAGS@ -I. -I$(NUFXSRCDIR) @DEFS@
 
 #ifdef PURIFY_BUILD
 #  PURIFY	= purify
@@ -64,7 +64,11 @@
 # Build stuff
 #
 
-all: $(PRODUCT)
+# XXX - until pkgsrc has a sane way to invoke multiple "build" targets
+../nufxlib-101/libnufx.a:
+	cd ../nufxlib-101 && $(MAKE)
+
+all: ../nufxlib-101/libnufx.a $(PRODUCT)
 	@true
 
 install: $(PRODUCT)
@@ -90,7 +94,7 @@
 	@$(MAKE) PURIFY_BUILD=1
 
 $(PRODUCT): $(OBJS) $(NUFXLIB)
-	$(PURIFY) $(QUANTIFY) $(CC) -o $@ $(OBJS) -L$(NUFXSRCDIR) -L$(libdir) -lnufx @DMALLOC@
+	$(PURIFY) $(QUANTIFY) $(CC) -o $@ $(OBJS) -L$(NUFXSRCDIR) $(LDFLAGS) -lnufx @DMALLOC@
 
 clean:
 	-rm -f *.o core