--- Makefile.orig	Tue Aug 23 20:06:02 2005
+++ Makefile	Mon Sep 12 19:21:57 2005
@@ -65,13 +65,13 @@
 samples_dir = $(top_srcdir)/samples
 rxtests_dir = $(top_srcdir)/rxtests
 
-prefix = /usr/local
+prefix = $(PREFIX)
 
 mandir = $(prefix)/man/man1
 catdir = $(prefix)/bin
 libdir = $(prefix)/lib
 bindir = $(prefix)/bin
-appdir = $(prefix)/oorexx
+appdir = $(prefix)/lib/oorexx
 
 ####
 #### OORexx Object Files & Dependencies
@@ -202,10 +202,8 @@
 
 
 EXTRA_FLAGS = -pthread -shared   
-CXX = g++
-CC = gcc 
-CFLAGS   = -g -O2 -DNOOPT -DPTHREAD_KERNEL -DSHARED -D_POSIX_THREAD -D_REENTRANT -DHIGHTID -D_GNU_SOURCE -DLINUX -DOPSYS_LINUX
-CXXFLAGS = -g -O2 -DNOOPT -DPTHREAD_KERNEL -DSHARED -D_POSIX_THREAD -D_REENTRANT -DHIGHTID -D_GNU_SOURCE -DLINUX -DOPSYS_LINUX
+CFLAGS   += -DNOOPT -DPTHREAD_KERNEL -DSHARED -D_POSIX_THREAD -D_REENTRANT -DHIGHTID -D_GNU_SOURCE -DLINUX -DOPSYS_LINUX
+CXXFLAGS += -DNOOPT -DPTHREAD_KERNEL -DSHARED -D_POSIX_THREAD -D_REENTRANT -DHIGHTID -D_GNU_SOURCE -DLINUX -DOPSYS_LINUX
 COMMON_CPPFLAGS = -DORX_VER=$(MAJOR) -DORX_REL=$(MINOR) -DORX_MOD=$(MOD_LVL) -DORX_FIX=0 -DORX_CATDIR=\"$(catdir)\" -DHIGHTID
 
 DEFS = -DHAVE_CONFIG_H
@@ -1009,25 +1007,25 @@
 	@rm -f $(SPROGRAM)
 
 install: $(PROGRAMS) $(SHARED_LIBRARIES) rexxown
-	@install $(SHARED_LIBRARIES) $(libdir)
-	@install $(PROGRAMS) $(bindir)
-	@hash && ./rexximg.sh         	
-	@install $(SUPFILES) $(bindir)
-	@install $(MANPAGES) $(mandir)
+	$(BSD_INSTALL_PROGRAM) $(SHARED_LIBRARIES) $(libdir)
+	$(BSD_INSTALL_PROGRAM) $(PROGRAMS) $(bindir)
+	./rexximg.sh
+	$(BSD_INSTALL_DATA) $(SUPFILES) $(bindir)
+	$(BSD_INSTALL_MAN) $(MANPAGES) $(mandir)
 
 rexxown: $(SPROGRAM) $(SLIBRARY)
-	@mkdir -p $(appdir)/samples $(appdir)/rxtests
+	mkdir -p $(EXAMPLESDIR) $(appdir)/rxtests
 
 .for i in $(samples_dir)/*.rex $(samples_dir)/*.cls 
-	@cp -n $i $(appdir)/samples 
+	$(BSD_INSTALL_DATA) $i $(EXAMPLESDIR)
 .endfor	
 
 .for i in $(rxtests_dir)/*.rex $(rxtests_dir)/trexx $(rxtests_dir)/README
-	@cp -n $i $(appdir)/rxtests
+	$(BSD_INSTALL_DATA) $i $(appdir)/rxtests
 .endfor
 
-	@install $(SPROGRAM) $(appdir)/rxtests
-	@install $(SLIBRARY) $(appdir)/rxtests
+	$(BSD_INSTALL_PROGRAM) $(SPROGRAM) $(appdir)/rxtests
+	$(BSD_INSTALL_PROGRAM) $(SLIBRARY) $(appdir)/rxtests
 
 deinstall: 
 	@cd $(bindir) && rm -f $(PROGRAMS) $(SUPFILES)