diff options
Diffstat (limited to 'graphics/netpbm/files/patch-bb')
| -rw-r--r-- | graphics/netpbm/files/patch-bb | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/graphics/netpbm/files/patch-bb b/graphics/netpbm/files/patch-bb index 5f0a5e1e43e..e020136d8d9 100644 --- a/graphics/netpbm/files/patch-bb +++ b/graphics/netpbm/files/patch-bb @@ -1,6 +1,6 @@ ---- Makefile.common.orig Tue May 1 00:45:34 2001 -+++ Makefile.common Tue May 15 00:00:00 2001 -@@ -155,24 +155,20 @@ +--- Makefile.common.orig Sun Jun 17 09:58:41 2001 ++++ Makefile.common Tue Jun 26 00:00:00 2001 +@@ -157,24 +157,21 @@ $(LIBOBJECTS): %.o: $(SRCSUBDIR)/%.c $(HEADERLINKS) # Note that the user may have configured -I options into CFLAGS. @@ -15,24 +15,25 @@ # The libxxx.so link is needed to link the executables. lib$(LIBROOT).so: $(SONAME) rm -f $@ - ln -s $< $@ + $(SYMLINK) $< $@ -# The $(SONAME) link is only needed to test the programs without -# installing the libraries (in that case, you also need to direct the -# dynamic linker to the source directories, e.g. set LD_LIBRARY_PATH). -$(SONAME): lib$(LIBROOT).so.$(MAJ).$(MIN) - rm -f $@ -- ln -s $< $@ +- $(SYMLINK) $< $@ -lib$(LIBROOT).so.$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) \ - $(LIBOPT) - $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \ - `$(LIBOPT) $(LIBLIBS)` -lc $(CDEBUG) -+$(SONAME): $(SHLIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) $(LIBOPT) lib$(LIBROOT).a ++$(SONAME): $(SHLIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) \ ++ $(LIBOPT) lib$(LIBROOT).a + $(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \ + `$(LIBOPT) $(LIBLIBS)` $(LDFLAGS) $(CDEBUG) - # Static library. Unused by default, but with a small change to make files... + # Static library. lib$(LIBROOT).a: $(LIBOBJECTS) $(LIBOBJECTS_X) -@@ -204,7 +200,7 @@ +@@ -215,7 +212,7 @@ install.merge.common: $(MERGENAME) $(NOMERGEBINARIES) install.script cd $(INSTALLBINARIES) ; rm -f $(BINARIES) $(MERGE_ALIASES) ifneq ($(MERGENAME)x,x) @@ -41,7 +42,7 @@ $(MERGENAME) $(INSTALLBINARIES) cd $(INSTALLBINARIES) ; \ for i in $(MERGEBINARIES) $(MERGE_ALIASES) ; \ -@@ -214,7 +210,7 @@ +@@ -225,7 +222,7 @@ ifneq ($(NOMERGEBINARIES)x,x) for x in $(NOMERGEBINARIES); \ do \ @@ -50,7 +51,7 @@ $$x $(INSTALLBINARIES); \ done endif -@@ -225,7 +221,7 @@ +@@ -236,7 +233,7 @@ # Make and Install know that pbmmake.exe counts as pbmmake. for x in $(BINARIES); \ do \ @@ -59,7 +60,7 @@ $$x $(INSTALLBINARIES); \ done -@@ -234,7 +230,7 @@ +@@ -245,7 +242,7 @@ ifneq ($(SCRIPTS)x,x) for x in $(SCRIPTS); \ do \ @@ -68,7 +69,7 @@ $(INSTALLSCRIPTS); \ done endif -@@ -271,7 +267,7 @@ +@@ -282,7 +279,7 @@ # directory when you compile your programs. for x in $(INTERFACE_HEADERS); \ do \ @@ -77,7 +78,7 @@ $(INSTALLHDRS); \ done -@@ -279,15 +275,14 @@ +@@ -290,17 +287,16 @@ # .PHONY: install.staticlib install.staticlib: lib$(LIBROOT).a @@ -85,15 +86,17 @@ + ${BSD_INSTALL_DATA} $< $(INSTALLLIBS)/$< .PHONY: install.lib.common - # install a shared library + ifeq ($(NETPBMLIBSUFFIX),so) + # install a Unix-style shared library -install.lib.common: lib$(LIBROOT).so.$(MAJ).$(MIN) - cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so.$(MAJ).* - $(INSTALL) -c -m $(INSTALL_PERM_LIBD) $< $(INSTALLLIBS) +install.lib.common: $(SONAME) + cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so.* + ${BSD_INSTALL_DATA} $< $(INSTALLLIBS) - cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so; ln -s $< lib$(LIBROOT).so -- cd $(INSTALLLIBS) ; rm -f $(SONAME); ln -s $< $(SONAME) - - .PHONY: clean.common - clean.common: + cd $(INSTALLLIBS) ; \ + rm -f lib$(LIBROOT).so; $(SYMLINK) $< lib$(LIBROOT).so +- cd $(INSTALLLIBS) ; rm -f $(SONAME); $(SYMLINK) $< $(SONAME) + endif + ifeq ($(NETPBMLIBSUFFIX),dll) + #install a Windows DLL shared library |