diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2019-02-16 18:05:10 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2019-02-16 18:05:10 +0000 |
| commit | 2d5e6106c29d15c1c176405dd723e633c77d68b0 (patch) | |
| tree | 5cdef8c44d4fe09cbf9a5a01208962529af7d2a3 /lib | |
| parent | c07539b1f8e185b1353449eb167d671488096c03 (diff) | |
| download | netpbm-mirror-2d5e6106c29d15c1c176405dd723e633c77d68b0.tar.gz netpbm-mirror-2d5e6106c29d15c1c176405dd723e633c77d68b0.tar.xz netpbm-mirror-2d5e6106c29d15c1c176405dd723e633c77d68b0.zip | |
Handle libnetpbm.so symlink in package and install better
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@3548 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/Makefile b/lib/Makefile index 65177758..bc758df4 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -221,7 +221,7 @@ libpm.o: compile.h .PHONY: install.lib ifeq ($(NETPBMLIBTYPE),unixshared) # install a Unix-style shared library -install.lib: $(PKGDIR)/lib $(PKGDIR)/link +install.lib: $(PKGDIR)/lib $(PKGDIR)/sharedlink cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).* $(INSTALL) -c -m $(INSTALL_PERM_LIBD) \ libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) $(PKGDIR)/lib/ @@ -263,26 +263,27 @@ $(INTERFACE_HEADERS:%=%_installhdr): $(PKGDIR)/include/netpbm $(SRCDIR)/lib/$(@:%_installhdr=%) $(PKGDIR)/include/netpbm/ .PHONY: install.staticlib -install.staticlib: $(PKGDIR)/link +install.staticlib: $(PKGDIR)/staticlink $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \ - $(PKGDIR)/link + $(PKGDIR)/staticlink # Install a shared library stub -- the ".so" file used at link time to # prepare a program for dynamically linking a library at run time .PHONY: install.sharedlibstub -install.sharedlibstub: $(PKGDIR)/link +install.sharedlibstub: $(PKGDIR)/sharedlink ifeq ($(NETPBMLIBTYPE),unixshared) # install the link-time (.so) links to the runtime libraries - cd $(PKGDIR)/link ; \ + cd $(PKGDIR)/sharedlink ; \ rm -f libnetpbm.$(NETPBMLIBSUFFIX); \ $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \ libnetpbm.$(NETPBMLIBSUFFIX) endif ifeq ($(NETPBMLIBTYPE),dll) - $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.dll.a $(PKGDIR)/link + $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.dll.a \ + $(PKGDIR)/sharedlink endif ifeq ($(NETPBMLIBTYPE),dylib) - cd $(PKGDIR)/link/ ; \ + cd $(PKGDIR)/sharedlink/ ; \ rm -f libnetpbm.dylib; \ $(SYMLINK) ../lib/libnetpbm.$(MAJ).$(MIN).dylib libnetpbm.dylib endif |