*** Makefile.orig	Fri Apr  2 19:52:27 1999
--- Makefile	Fri Apr  2 19:51:11 1999
***************
*** 7,13 ****
  CC = g++
  
  # Flags to pass to the C++ compiler
! FLAGS = -O -Wall
  
  # Your tar
  TAR = tar
--- 7,13 ----
  CC = g++
  
  # Flags to pass to the C++ compiler
! FLAGS = -DPREFIX=\"${PREFIX}\" ${CFLAGS} -L /usr/X11R6/lib -I /usr/X11R6/include
  
  # Your tar
  TAR = tar
***************
*** 17,29 ****
  ZIPR = gzip -9
  
  # Default installion directory for the console version of PEQ
! DIR_CONSOLE_PEQ = /usr/games
  
  # Default installion directory for the X version of PEQ
! DIR_X_PEQ = /usr/games
  
  # Default installion directory for peq.lib (the quote library)
! DIR_LIB = /usr/share/games
  
  # Get current date
  LIB_DATE = `date +%m%d%y`
--- 17,29 ----
  ZIPR = gzip -9
  
  # Default installion directory for the console version of PEQ
! DIR_CONSOLE_PEQ = ${PREFIX}/bin
  
  # Default installion directory for the X version of PEQ
! DIR_X_PEQ = ${PREFIX}/bin
  
  # Default installion directory for peq.lib (the quote library)
! DIR_LIB = ${PREFIX}/share/peq
  
  # Get current date
  LIB_DATE = `date +%m%d%y`
***************
*** 42,70 ****
  	$(CC) $(FLAGS) -o peq peq.cpp strmid.o show.o read.o proc.o ocfile.o arg.o
  	$(CC) $(FLAGS) -o xpeq -lqt xpeq.cpp strmid.o show.o read.o proc.o ocfile.o
  
- ## "install" gives a handy message about how to install PEQ
  install:
! 	@echo "No such option! Use..."
! 	@echo "'make install-console' to install the console of PEQ"
! 	@echo "'make install-x' to install the X version of PEQ"
! 	@echo "'make install-lib' to install peq.lib (the quote library)"
! 	@echo "'make install-all' to install all of the above"
! 	@echo "'make install-console-lib' to install console PEQ and peq.lib"
! 	@echo "'make install-x-lib' to install X PEQ and peq.lib"
! 	@echo "'make install-console-x' to install console and X PEQ"
! 	@echo "If in doubt... just type 'make install-all' :-)"
  
  install-console:
! 	cp peq $(DIR_CONSOLE_PEQ)/peq -f
  
  install-x:
! 	cp xpeq $(DIR_X_PEQ)/xpeq -f
  
  install-lib:
! 	cp peq.lib $(DIR_LIB)/peq.lib -f
! 
! install-all:
! 	make install-console ; make install-x ; make install-lib
  
  install-console-lib:
  	make install-console ; make install-lib
--- 42,60 ----
  	$(CC) $(FLAGS) -o peq peq.cpp strmid.o show.o read.o proc.o ocfile.o arg.o
  	$(CC) $(FLAGS) -o xpeq -lqt xpeq.cpp strmid.o show.o read.o proc.o ocfile.o
  
  install:
! 	make install-console ; make install-x ; make install-lib
  
  install-console:
! 	cp -f peq $(DIR_CONSOLE_PEQ)/peq
  
  install-x:
! 	cp -f xpeq $(DIR_X_PEQ)/xpeq
  
  install-lib:
! 	rm -rf $(DIR_LIB)
! 	mkdir $(DIR_LIB)
! 	cp -f peq.lib $(DIR_LIB)/peq.lib
  
  install-console-lib:
  	make install-console ; make install-lib
***************
*** 78,86 ****
  ## "uninstall" erases all traces of PEQ from your system (but why would you
  ## want to do that?)
  uninstall:
! 	rm $(DIR_CONSOLE_PEQ)/peq -f
! 	rm $(DIR_X_PEQ)/xpeq -f
! 	rm $(DIR_LIB)/peq.lib -f
  
  ## "clean" cleans up all the junk and leaves the uncompiled code alone
  clean:
--- 68,76 ----
  ## "uninstall" erases all traces of PEQ from your system (but why would you
  ## want to do that?)
  uninstall:
! 	rm -f $(DIR_CONSOLE_PEQ)/peq
! 	rm -f $(DIR_X_PEQ)/xpeq
! 	rm -f $(DIR_LIB)/peq.lib
  
  ## "clean" cleans up all the junk and leaves the uncompiled code alone
  clean: