|
 |
294826 |
diff --git a/lib/Makefile b/lib/Makefile
|
|
|
294826 |
index bc758df..7f51b41 100644
|
|
|
294826 |
--- a/lib/Makefile
|
|
|
294826 |
+++ b/lib/Makefile
|
|
|
294826 |
@@ -221,7 +221,7 @@ libpm.o: compile.h
|
|
|
294826 |
.PHONY: install.lib
|
|
|
294826 |
ifeq ($(NETPBMLIBTYPE),unixshared)
|
|
|
294826 |
# install a Unix-style shared library
|
|
|
294826 |
-install.lib: $(PKGDIR)/lib $(PKGDIR)/sharedlink
|
|
|
294826 |
+install.lib: $(PKGDIR)/lib
|
|
|
294826 |
cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).*
|
|
|
294826 |
$(INSTALL) -c -m $(INSTALL_PERM_LIBD) \
|
|
|
294826 |
libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) $(PKGDIR)/lib/
|
|
|
294826 |
@@ -263,27 +263,26 @@ $(INTERFACE_HEADERS:%=%_installhdr): $(PKGDIR)/include/netpbm
|
|
|
294826 |
$(SRCDIR)/lib/$(@:%_installhdr=%) $(PKGDIR)/include/netpbm/
|
|
|
294826 |
|
|
|
294826 |
.PHONY: install.staticlib
|
|
|
294826 |
-install.staticlib: $(PKGDIR)/staticlink
|
|
|
294826 |
+install.staticlib: $(PKGDIR)/lib
|
|
|
294826 |
$(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
|
|
|
294826 |
- $(PKGDIR)/staticlink
|
|
|
294826 |
+ $(PKGDIR)/lib
|
|
|
294826 |
|
|
|
294826 |
# Install a shared library stub -- the ".so" file used at link time to
|
|
|
294826 |
# prepare a program for dynamically linking a library at run time
|
|
|
294826 |
.PHONY: install.sharedlibstub
|
|
|
294826 |
-install.sharedlibstub: $(PKGDIR)/sharedlink
|
|
|
294826 |
+install.sharedlibstub: $(PKGDIR)/lib
|
|
|
294826 |
ifeq ($(NETPBMLIBTYPE),unixshared)
|
|
|
294826 |
# install the link-time (.so) links to the runtime libraries
|
|
|
294826 |
- cd $(PKGDIR)/sharedlink ; \
|
|
|
294826 |
+ cd $(PKGDIR)/lib ; \
|
|
|
294826 |
rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
|
|
|
294826 |
- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
|
|
|
294826 |
+ $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
|
|
|
294826 |
libnetpbm.$(NETPBMLIBSUFFIX)
|
|
|
294826 |
endif
|
|
|
294826 |
ifeq ($(NETPBMLIBTYPE),dll)
|
|
|
294826 |
- $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.dll.a \
|
|
|
294826 |
- $(PKGDIR)/sharedlink
|
|
|
294826 |
+ $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.dll.a $(PKGDIR)/link
|
|
|
294826 |
endif
|
|
|
294826 |
ifeq ($(NETPBMLIBTYPE),dylib)
|
|
|
294826 |
- cd $(PKGDIR)/sharedlink/ ; \
|
|
|
294826 |
+ cd $(PKGDIR)/link/ ; \
|
|
|
294826 |
rm -f libnetpbm.dylib; \
|
|
|
294826 |
$(SYMLINK) ../lib/libnetpbm.$(MAJ).$(MIN).dylib libnetpbm.dylib
|
|
|
294826 |
endif
|