--- psutils/Makefile.unix.orig Sun Oct 7 21:54:37 2001 +++ psutils/Makefile.unix Sun Oct 7 22:18:10 2001 @@ -25,10 +25,11 @@ OS = UNIX -BINDIR = /usr/local/bin +prefix = /sw +BINDIR = $(prefix)/bin SCRIPTDIR = $(BINDIR) -INCLUDEDIR = /usr/local/share/psutils -PERL = /usr/local/bin/perl +INCLUDEDIR = $(prefix)/share/psutils +PERL = /usr/bin/perl BINMODE = 0755 MANMODE = 0644 @@ -36,9 +37,9 @@ INSTALL = install -c -m $(BINMODE) INSTALLMAN = install -c -m $(MANMODE) MANEXT = 1 -MANDIR = /usr/local/share/man/man$(MANEXT) +MANDIR = $(prefix)/share/man/man$(MANEXT) -CC = gcc +CC = cc CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall BIN = psbook psselect pstops epsffit psnup \ @@ -219,28 +220,28 @@ install: install.bin install.script install.man install.include install.bin: $(BIN) - -mkdir $(BINDIR) + -mkdir -p $(BINDIR) @for i in $(BIN); do \ echo Installing $$i; \ $(INSTALL) $$i $(BINDIR); \ done install.script: $(PERLSCRIPTS) $(SHELLSCRIPTS) - -mkdir $(SCRIPTDIR) + -mkdir -p $(SCRIPTDIR) @for i in $(PERLSCRIPTS) $(SHELLSCRIPTS); do \ echo Installing $$i; \ $(INSTALL) $$i $(SCRIPTDIR); \ done install.include: $(INCLUDES) - -mkdir $(INCLUDEDIR) + -mkdir -p $(INCLUDEDIR) @for i in $(INCLUDES); do \ echo Installing $$i; \ $(INSTALLMAN) $$i $(INCLUDEDIR); \ done install.man: $(MANPAGES) - -mkdir $(MANDIR) + -mkdir -p $(MANDIR) @for i in $(MANPAGES); do \ echo Installing manual page for $$i; \ $(INSTALLMAN) $$i $(MANDIR)/$$i; \