--- file_not_specified_in_diff +++ file_not_specified_in_diff @@ -, +, @@ --- Makefile +++ Makefile @@ -2,21 +2,23 @@ PROG=gnome-manual-duplex VERSION=0.43 -INSTALL=install -LPADMIN=/usr/sbin/lpadmin - -BIN=$(DESTDIR)/usr/bin -SHARE=$(DESTDIR)/usr/share -APPL=$(DESTDIR)/usr/share/applications -PIXMAPS=$(DESTDIR)/usr/share/pixmaps -LIBCUPS=$(DESTDIR)/usr/lib/cups -LIBBONOBO=$(DESTDIR)/usr/lib/bonobo -MANDIR=$(DESTDIR)/usr/share/man -SERVICES=$(DESTDIR)/usr/share/dbus-1/services/ -APPLETS=$(DESTDIR)/usr/share/gnome-panel/4.0/applets/ +INSTALL ?= install +LPADMIN ?= /usr/sbin/lpadmin + +LIBDIR ?= lib +BIN ?= $(DESTDIR)/usr/bin +SHARE ?= $(DESTDIR)/usr/share +APPL ?= $(DESTDIR)/usr/share/applications +PIXMAPS ?= $(DESTDIR)/usr/share/pixmaps +LIBCUPS ?= $(DESTDIR)/usr/$(LIBDIR)/cups +LIBBONOBO ?= $(DESTDIR)/usr/$(LIBDIR)/bonobo +MANDIR ?= $(DESTDIR)/usr/share/man +DOCDIR ?= $(DESTDIR)/usr/share/doc/$(PROG) +SERVICES ?= $(DESTDIR)/usr/share/dbus-1/services/ +APPLETS ?= $(DESTDIR)/usr/share/gnome-panel/4.0/applets/ UNAME := $(shell uname) -GSED=sed +GSED ?= sed ifeq ($(UNAME),Darwin) GSED=gsed endif @@ -257,9 +259,9 @@ # # Doc... # - $(INSTALL) -d $(SHARE)/doc/$(PROG) - $(INSTALL) -m644 README $(SHARE)/doc/$(PROG) - $(INSTALL) -m644 COPYING $(SHARE)/doc/$(PROG) + $(INSTALL) -d $(DOCDIR) + $(INSTALL) -m644 README $(DOCDIR) + $(INSTALL) -m644 COPYING $(DOCDIR) # /usr/share/locale $(INSTALL) -d $(SHARE)/locale cd locale; \