diff -p -up printoxx-2.7/Makefile printoxx-2.7.new/Makefile --- printoxx-2.7/Makefile 2010-05-18 10:09:15.000000000 +0200 +++ printoxx-2.7.new/Makefile 2010-05-18 21:40:53.738852342 +0200 @@ -5,9 +5,9 @@ VERSION = 2.7 SOURCE = $(PROGRAM)-$(VERSION).cc # defaults for parameters that may be pre-defined -CXXFLAGS ?= -O3 -g -Wall -LDFLAGS ?= -O3 -g -Wall -rdynamic -PREFIX ?= /usr/local +CXXFLAGS ?= $(SLKCFLAGS) -Wall +LDFLAGS ?= $(SLKCFLAGS) -Wall -rdynamic +PREFIX ?= /usr CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-2.0` LFLAGS = $(LDFLAGS) `pkg-config --libs gtk+-2.0 gthread-2.0` @@ -16,8 +16,8 @@ BINDIR = $(PREFIX)/bin DATADIR = $(PREFIX)/share/$(PROGRAM) ICONDIR = $(DATADIR)/icons DESKTOP = $(DATADIR)/kornelix-$(PROGRAM).desktop -DOCDIR = $(PREFIX)/share/doc/$(PROGRAM) -MANDIR = $(PREFIX)/share/man/man1 +DOCDIR = $(PREFIX)/doc/$(PROGRAM)-$(VERSION) +MANDIR = $(PREFIX)/man/man1 $(PROGRAM): $(PROGRAM).o zfuncs.o $(CXX) $(LFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o Only in printoxx-2.7.new/: Makefile~ Common subdirectories: printoxx-2.7/doc and printoxx-2.7.new/doc Common subdirectories: printoxx-2.7/icons and printoxx-2.7.new/icons Common subdirectories: printoxx-2.7/locales and printoxx-2.7.new/locales