38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
|
diff -urNp a/lib/Makefile b/lib/Makefile
|
||
|
|
--- a/lib/Makefile 2021-12-06 10:55:43.832967143 +0100
|
||
|
|
+++ b/lib/Makefile 2021-12-06 10:56:09.862162960 +0100
|
||
|
|
@@ -220,7 +220,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
|
||
|
|
cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).*
|
||
|
|
$(INSTALL) -c -m $(INSTALL_PERM_LIBD) \
|
||
|
|
libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) $(PKGDIR)/lib/
|
||
|
|
@@ -262,19 +262,19 @@ $(INTERFACE_HEADERS:%=%_installhdr): $(P
|
||
|
|
$(SRCDIR)/lib/$(@:%_installhdr=%) $(PKGDIR)/include/netpbm/
|
||
|
|
|
||
|
|
.PHONY: install.staticlib
|
||
|
|
-install.staticlib: $(PKGDIR)/link
|
||
|
|
+install.staticlib: $(PKGDIR)/lib
|
||
|
|
$(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
|
||
|
|
- $(PKGDIR)/link
|
||
|
|
+ $(PKGDIR)/lib
|
||
|
|
|
||
|
|
# 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)/lib
|
||
|
|
ifeq ($(NETPBMLIBTYPE),unixshared)
|
||
|
|
# install the link-time (.so) links to the runtime libraries
|
||
|
|
- cd $(PKGDIR)/link ; \
|
||
|
|
+ cd $(PKGDIR)/lib ; \
|
||
|
|
rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
|
||
|
|
- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
|
||
|
|
+ $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
|
||
|
|
libnetpbm.$(NETPBMLIBSUFFIX)
|
||
|
|
endif
|
||
|
|
ifeq ($(NETPBMLIBTYPE),dll)
|