diff -ur advanced.orig/common.mk advanced/common.mk --- advanced.orig/common.mk 2012-12-31 04:15:55.000000000 +0200 +++ advanced/common.mk 2013-05-17 13:54:18.051579812 +0300 @@ -465,7 +465,7 @@ install.data: $(DATAFILES:%=%_installdata) $(SUBDIRS:%=%/install.data) .PHONY: $(DATAFILES:%=%_installdata) -$(DATAFILES:%=%_installdata): $(PKGDIR)/misc +$(DATAFILES:%=%_installdata): $(PKGDIR)/share/netpbm $(INSTALL) -c -m $(INSTALL_PERM_DATA) \ $(SRCDIR)/$(SUBDIR)/$(@:%_installdata=%) $< diff -ur advanced.orig/lib/Makefile advanced/lib/Makefile --- advanced.orig/lib/Makefile 2011-12-30 20:13:51.000000000 +0200 +++ advanced/lib/Makefile 2013-05-17 13:56:14.497583060 +0300 @@ -214,7 +214,7 @@ .PHONY: install.lib ifeq ($(NETPBMLIBTYPE),unixshared) # install a Unix-style shared library -install.lib: $(PKGDIR)/lib $(PKGDIR)/link +install.lib: $(PKGDIR)/lib $(PKGDIR)/lib cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).* $(INSTALL) -c -m $(INSTALL_PERM_LIBD) \ libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) $(PKGDIR)/lib/ @@ -256,26 +256,26 @@ $(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) \ 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)/lib endif ifeq ($(NETPBMLIBTYPE),dylib) - cd $(PKGDIR)/link/ ; \ + cd $(PKGDIR)/lib/ ; \ rm -f libnetpbm.dylib; \ $(SYMLINK) ../lib/libnetpbm.$(MAJ).$(MIN).dylib libnetpbm.dylib endif