diff -up metapixel-1.0.2/Makefile.makefile metapixel-1.0.2/Makefile --- metapixel-1.0.2/Makefile.makefile 2006-12-10 18:59:54.000000000 +0100 +++ metapixel-1.0.2/Makefile 2007-08-31 20:47:48.000000000 +0200 @@ -1,4 +1,4 @@ -PREFIX = /usr/local +PREFIX = /usr/ INSTALL = install MANPAGE_XSL = /sw/share/xml/xsl/docbook-xsl/manpages/docbook.xsl @@ -8,7 +8,7 @@ MANDIR = $(PREFIX)/share/man VERSION = 1.0.2 #DEBUG = -g -OPTIMIZE = -O2 +#OPTIMIZE = -O2 #PROFILE = -pg MACOS_LDOPTS = -L/sw/lib @@ -16,8 +16,8 @@ MACOS_CCOPTS = -I/sw/include FORMATDEFS = -DRWIMG_JPEG -DRWIMG_PNG -DRWIMG_GIF -LDOPTS = $(MACOS_LDOPTS) -L/usr/X11R6/lib $(PROFILE) $(DEBUG) -CCOPTS = $(MACOS_CCOPTS) -I/usr/X11R6/include -I/usr/X11R6/include/X11 -I. -Irwimg -Wall $(OPTIMIZE) $(DEBUG) $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\" +LDOPTS = $(PROFILE) $(DEBUG) $(LFLAGS) +CCOPTS = -I. -Irwimg -Wall $(OPTIMIZE) $(CFLAGS) $(DEBUG) $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\" CC = gcc #LIBFFM = -lffm @@ -52,12 +52,13 @@ librwimg : $(MAKE) -C rwimg install : metapixel metapixel.1 - $(INSTALL) -d $(BINDIR) - $(INSTALL) metapixel $(BINDIR) - $(INSTALL) metapixel-prepare $(BINDIR) - $(INSTALL) metapixel.1 $(MANDIR)/man1 - $(INSTALL) metapixel-imagesize $(BINDIR) - $(INSTALL) metapixel-sizesort $(BINDIR) + $(INSTALL) -d $(DESTDIR)$(BINDIR) + $(INSTALL) -d $(DESTDIR)$(MANDIR)/man1 + $(INSTALL) metapixel $(DESTDIR)$(BINDIR) + $(INSTALL) metapixel-prepare $(DESTDIR)$(BINDIR) + $(INSTALL) metapixel.1 $(DESTDIR)$(MANDIR)/man1 + $(INSTALL) metapixel-imagesize $(DESTDIR)$(BINDIR) + $(INSTALL) metapixel-sizesort $(DESTDIR)$(BINDIR) clean : rm -f *.o metapixel convert metapixel-imagesize *~
