diff -Nurd -x'*~' xrootconsole-0.6.orig/Makefile xrootconsole-0.6/Makefile --- xrootconsole-0.6.orig/Makefile 2004-02-20 16:53:28.000000000 -0500 +++ xrootconsole-0.6/Makefile 2008-12-08 01:13:38.000000000 -0500 @@ -33,9 +33,9 @@ ########################################################################### EXEC = xrootconsole -BINDIR = /usr/local/bin +BINDIR = $(prefix)/bin MANFILE = xrootconsole.1 -MANDIR = /usr/local/share/man/man1 +MANDIR = $(prefix)/share/man/man1 VERSION = $(shell tag=$$(echo '$$Name: RELEASE-0_6 $$' | sed -e 's/\$$//g' -e 's/Name://g'); \ if [ $$tag ]; \ @@ -48,15 +48,15 @@ # for production CFLAGS = -O2 -DNDEBUG -Wall "-DXROOTCONSOLE_VERSION=\"$(VERSION)\"" \ - -I /usr/X11R6/include -LDFLAGS = -s + -I/usr/X11R6/include +LDFLAGS = # for testing #CFLAGS = -g -Wall "-DXROOTCONSOLE_VERSION=\"$(VERSION) (debug build)\"" \ - -I /usr/X11R6/include + -I/usr/X11R6/include #LDFLAGS = -LIBS = -L/usr/X11R6/lib -lX11 -lutil +LIBS = -L/usr/X11R6/lib -lX11 OBJS = main.o util.o @@ -76,5 +76,7 @@ rm -f $(EXEC) *.o core *~ install: $(EXEC) - cp $(EXEC) $(BINDIR) - cp $(MANFILE) $(MANDIR) + install -d $(BINDIR) + install -c $(EXEC) $(BINDIR)/$(EXEC) + install -d $(MANDIR) + install -c $(MANFILE) $(MANDIR)/$(MANFILE)