--- makefile.orig	Thu Feb 28 12:44:12 2002
+++ makefile	Wed Mar 13 11:50:31 2002
@@ -10,14 +10,12 @@
 # Set this for where to store the man pages and executables.
 # If you want to store this as part of an official distribution,
 # change this to "/usr":
-PREFIX=/usr/local
 
 # Set "EXE_SUFFIX" to ".exe" if you're running on Windows, like this:
 # EXE_SUFFIX=.exe
 EXE_SUFFIX=
 
 # Set this to your C compiler, if it's not "gcc"; a likely alternative is "cc":
-CC=gcc
 
 # Set this to the name of your "install" program.  On some systems,
 # "install -C" would be useful (so unchanged files won't be modified),
@@ -41,7 +39,7 @@
 ARCH=i386
 VERSIONEDNAME=$(NAME)-$(VERSION)
 INSTALL_DIR=$(PREFIX)/bin
-MAN_DIR=$(PREFIX)/share/man
+MAN_DIR=$(PREFIX)/man
 MAN_DIR_MAN1=$(MAN_DIR)/man1
 DOC_DIR=$(PREFIX)/share/doc/$(VERSIONEDNAME)-$(RPM_VERSION)
 POSTED_DIR=/home/dwheeler/dwheeler.com/sloccount
@@ -86,7 +84,7 @@
    sql_count \
    tcl_count
 
-MANPAGES=sloccount.1.gz
+MANPAGES=sloccount.1
 
 MYDOCS=sloccount.html README TODO ChangeLog
 
@@ -94,13 +92,13 @@
 all: lexcount1$(EXE_SUFFIX) c_count$(EXE_SUFFIX) java_count$(EXE_SUFFIX) php_count$(EXE_SUFFIX)
 
 lexcount1$(EXE_SUFFIX): lexcount1.c
-	$(CC) lexcount1.c -o lexcount1$(EXE_SUFFIX)
+	$(CC) ${CFLAGS} lexcount1.c -o lexcount1$(EXE_SUFFIX)
 
 c_count$(EXE_SUFFIX): c_count.c
-	$(CC) c_count.c -o c_count$(EXE_SUFFIX)
+	$(CC) ${CFLAGS} c_count.c -o c_count$(EXE_SUFFIX)
 
 php_count$(EXE_SUFFIX): php_count.c
-	$(CC) php_count.c -o php_count$(EXE_SUFFIX)
+	$(CC) ${CFLAGS} php_count.c -o php_count$(EXE_SUFFIX)
 
 sloccount.1.gz: sloccount.1
 	gzip -c sloccount.1 > sloccount.1.gz
@@ -111,25 +109,23 @@
 
 # This is USC's code counter, not built by default:
 c_lines: C_LINES.C
-	$(CC) C_LINES.C -o c_lines$(EXE_SUFFIX)
+	$(CC) ${CFLAGS} C_LINES.C -o c_lines$(EXE_SUFFIX)
 
 
 install_programs: all
-	$(INSTALL) $(EXECUTABLES) $(INSTALL_DIR)
+	${BSD_INSTALL_SCRIPT} $(EXECUTABLES) $(INSTALL_DIR)
 
 uninstall_programs:
 	cd $(INSTALL_DIR) && rm -f $(EXECUTABLES)
 
 install_man:
-	$(INSTALL_A_DIR) $(MAN_DIR_MAN1)
-	$(INSTALL) $(MANPAGES) $(MAN_DIR_MAN1)
+	${BSD_INSTALL_MAN} $(MANPAGES) $(MAN_DIR_MAN1)
 
 uninstall_man:
 	cd $(MAN_DIR_MAN1) && rm -f $(MANPAGES)
 
 install_docs: install_man
-	$(INSTALL_A_DIR) $(DOC_DIR)
-	$(INSTALL) $(MYDOCS) $(DOC_DIR)
+	${BSD_INSTALL_DATA} $(MYDOCS) $(DOC_DIR)
 
 uninstall_docs:
 	cd $(DOC_DIR) && rm -f $(MYDOCS) && rmdir $(DOC_DIR)