diff -Naur tuxpaint-0.9.22.orig/Makefile tuxpaint-0.9.22/Makefile --- tuxpaint-0.9.22.orig/Makefile 2014-08-19 07:28:33.000000000 +0000 +++ tuxpaint-0.9.22/Makefile 2016-05-20 17:57:53.889662053 +0000 @@ -138,7 +138,7 @@ # Magic Tool plug-ins INCLUDE_PREFIX:=$(DESTDIR)$(PREFIX)/include -MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib/tuxpaint/plugins +MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib$(LIBDIRSUFFIX)/tuxpaint/plugins # Docs and man page: @@ -886,15 +886,15 @@ cp -R win32/etc/ $(BIN_PREFIX); \ echo; \ echo "...Installing Library Modules..."; \ - mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders; \ - cp /usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders; \ - strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll; \ - mkdir -p $(BIN_PREFIX)/lib/gtk-2.0/2.10.0/loaders; \ - cp /usr/local/lib/gtk-2.0/loaders/*.dll $(BIN_PREFIX)/lib/gtk-2.0/2.10.0/loaders; \ - strip -s $(BIN_PREFIX)/lib/gtk-2.0/2.10.0/loaders/*.dll; \ - mkdir -p $(BIN_PREFIX)/lib/pango/1.6.0/modules; \ - cp /usr/local/lib/pango/1.6.0/modules/*.dll $(BIN_PREFIX)/lib/pango/1.6.0/modules; \ - strip -s $(BIN_PREFIX)/lib/pango/1.6.0/modules/*.dll; \ + mkdir -p $(BIN_PREFIX)/lib$(LIBDIRSUFFIX)/gdk-pixbuf-2.0/2.10.0/loaders; \ + cp /usr/local/lib$(LIBDIRSUFFIX)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib$(LIBDIRSUFFIX)/gdk-pixbuf-2.0/2.10.0/loaders; \ + strip -s $(BIN_PREFIX)/lib$(LIBDIRSUFFIX)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll; \ + mkdir -p $(BIN_PREFIX)/lib$(LIBDIRSUFFIX)/gtk-2.0/2.10.0/loaders; \ + cp /usr/local/lib$(LIBDIRSUFFIX)/gtk-2.0/loaders/*.dll $(BIN_PREFIX)/lib$(LIBDIRSUFFIX)/gtk-2.0/2.10.0/loaders; \ + strip -s $(BIN_PREFIX)/lib$(LIBDIRSUFFIX)/gtk-2.0/2.10.0/loaders/*.dll; \ + mkdir -p $(BIN_PREFIX)/lib$(LIBDIRSUFFIX)/pango/1.6.0/modules; \ + cp /usr/local/lib$(LIBDIRSUFFIX)/pango/1.6.0/modules/*.dll $(BIN_PREFIX)/lib$(LIBDIRSUFFIX)/pango/1.6.0/modules; \ + strip -s $(BIN_PREFIX)/lib$(LIBDIRSUFFIX)/pango/1.6.0/modules/*.dll; \ fi # Install symlink: @@ -1168,7 +1168,7 @@ ###### MAGIC_SDL_CPPFLAGS:=$(shell $(PKG_CONFIG) $(SDL_PCNAME) --cflags) -MAGIC_SDL_LIBS:=-L/usr/local/lib $(LIBMINGW) $(shell $(PKG_CONFIG) $(SDL_PCNAME) --libs) -lSDL_image -lSDL_ttf $(SDL_MIXER_LIB) +MAGIC_SDL_LIBS:=-L/usr/local/lib$(LIBDIRSUFFIX) $(LIBMINGW) $(shell $(PKG_CONFIG) $(SDL_PCNAME) --libs) -lSDL_image -lSDL_ttf $(SDL_MIXER_LIB) MAGIC_ARCH_LINKS:=-lintl $(PNG) windows_PLUGIN_LIBS:=$(MAGIC_SDL_LIBS) $(MAGIC_ARCH_LINKS)