$NetBSD: patch-Makefile.fip,v 1.1 2015/05/27 21:59:26 markd Exp $ --- Makefile.fip.orig 2015-03-08 05:03:56.000000000 +0000 +++ Makefile.fip @@ -5,8 +5,8 @@ include fipMakefile.srcs # General configuration variables: DESTDIR ?= / -INCDIR ?= $(DESTDIR)/usr/include -INSTALLDIR ?= $(DESTDIR)/usr/lib +INCDIR ?= $(DESTDIR)/$(PREFIX)/include +INSTALLDIR ?= $(DESTDIR)/$(PREFIX)/lib # Converts cr/lf to just lf DOS2UNIX = dos2unix @@ -28,10 +28,8 @@ CXXFLAGS ?= -O3 -fPIC -fexceptions -fvis CXXFLAGS += -D__ANSI__ CXXFLAGS += $(INCLUDE) -ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) - CFLAGS += -fPIC - CXXFLAGS += -fPIC -endif +CFLAGS += -fPIC +CXXFLAGS += -fPIC TARGET = freeimageplus STATICLIB = lib$(TARGET).a @@ -71,11 +69,9 @@ $(SHAREDLIB): $(MODULES) $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES) install: - install -d $(INCDIR) $(INSTALLDIR) - install -m 644 -o root -g root $(HEADER) $(INCDIR) - install -m 644 -o root -g root $(HEADERFIP) $(INCDIR) - install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) - install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) + $(BSD_INSTALL_DATA) $(HEADERFIP) $(INCDIR) + $(BSD_INSTALL_DATA) $(STATICLIB) $(INSTALLDIR) + $(BSD_INSTALL_LIB) $(SHAREDLIB) $(INSTALLDIR) ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)