diff options
| author | jlam <jlam@pkgsrc.org> | 2000-08-04 00:06:22 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2000-08-04 00:06:22 +0000 |
| commit | d304d88611b3652c342227828d46bfcf0bd6503e (patch) | |
| tree | 6a765fa9b422c19a90be5e4b4fc8e55e96406456 /textproc/glimpse | |
| parent | 036c5dba3f1538e8a0471bf4b6745e9b8e014f40 (diff) | |
| download | pkgsrc-d304d88611b3652c342227828d46bfcf0bd6503e.tar.gz | |
Move LDFLAGS to after the in-source -L directives to avoid conflicts
between libutil.a and system libutil.so. This makes this compile when
LOCALBASE=/usr.
Diffstat (limited to 'textproc/glimpse')
| -rw-r--r-- | textproc/glimpse/patches/patch-ab | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/textproc/glimpse/patches/patch-ab b/textproc/glimpse/patches/patch-ab new file mode 100644 index 00000000000..b1a2c2298ef --- /dev/null +++ b/textproc/glimpse/patches/patch-ab @@ -0,0 +1,27 @@ +$NetBSD: patch-ab,v 1.4 2000/08/04 00:06:22 jlam Exp $ + +--- Makefile.in.orig Wed Nov 20 21:28:42 1996 ++++ Makefile.in Thu Aug 3 19:54:40 2000 +@@ -34,7 +34,8 @@ + + CFLAGS = @CFLAGS@ -O -DSTRUCTURED_QUERIES=1 + ALL_CFLAGS = $(CFLAGS) $(DEFS) -I$(INDEXSRC) -I$(AGREPSRC) -I$(TEMPLATESRC)/include +-LINKFLAGS = @LDFLAGS@ -I$(INDEXSRC) -I$(AGREPSRC) -I$(TEMPLATESRC)/include ++LDFLAGS = @LDFLAGS@ ++LINKFLAGS = -L$(AGREPDIR) -L$(COMPRESSDIR) -L$(TEMPLATEDIR)/$(LIBTEMPLATE) -L$(TEMPLATEDIR)/$(LIBUTIL) $(LDFLAGS) + + .c.o: + $(CC) -c $(ALL_CFLAGS) $< +@@ -99,10 +100,10 @@ + cd $(COMPRESSDIR); $(MAKE) + + $(PROG): main.o $(OBJS) $(SRC) $(HDRS) $(AGREPDIR)/lib$(LIBAGREP).a $(TEMPLATEDIR)/$(LIBTEMPLATE)/lib$(LIBTEMPLATE).a $(TEMPLATEDIR)/$(LIBUTIL)/lib$(LIBUTIL).a $(COMPRESSDIR)/lib$(LIBCOMPRESS).a +- $(CC) $(LINKFLAGS) -L$(AGREPDIR) -L$(COMPRESSDIR) -L$(TEMPLATEDIR)/$(LIBTEMPLATE) -L$(TEMPLATEDIR)/$(LIBUTIL) -o $(PROG) main.o $(OBJS) -l$(LIBAGREP) -l$(LIBTEMPLATE) -l$(LIBUTIL) $(LIBS) ++ $(CC) $(LINKFLAGS) -o $(PROG) main.o $(OBJS) -l$(LIBAGREP) -l$(LIBTEMPLATE) -l$(LIBUTIL) $(LIBS) + + $(PROGSERVER): main_server.o $(OBJS) $(SRC) $(HDRS) $(AGREPDIR)/lib$(LIBAGREP).a $(TEMPLATEDIR)/$(LIBTEMPLATE)/lib$(LIBTEMPLATE).a $(TEMPLATEDIR)/$(LIBUTIL)/lib$(LIBUTIL).a $(COMPRESSDIR)/lib$(LIBCOMPRESS).a +- $(CC) $(LINKFLAGS) -L$(COMPRESSDIR) -L$(AGREPDIR) -L$(TEMPLATEDIR)/$(LIBTEMPLATE) -L$(TEMPLATEDIR)/$(LIBUTIL) -o $(PROGSERVER) main_server.o $(OBJS) -l$(LIBAGREP) -l$(LIBTEMPLATE) -l$(LIBUTIL) $(LIBS) ++ $(CC) $(LINKFLAGS) -o $(PROGSERVER) main_server.o $(OBJS) -l$(LIBAGREP) -l$(LIBTEMPLATE) -l$(LIBUTIL) $(LIBS) + + $(TEMPLATEDIR)/$(LIBTEMPLATE)/lib$(LIBTEMPLATE).a: + cd $(TEMPLATEDIR) ; $(MAKE) |