--- Makefile.orig	Fri Mar 17 10:35:33 2000
+++ Makefile	Fri Jan 12 03:02:20 2001
@@ -3,22 +3,22 @@
 #
 #  initial_directory is now set in the config file
 mpg123_location   := "mpg123"
-install_directory := "$(HOME)/bin"
+install_directory := "$(PREFIX)/bin"
 
 #
 #  Location of config file - Please edit this file before installing
 #
-config_file       := "$(HOME)/.cmp3rc"
+#config_file       := "$(HOME)/.cmp3rc"
 
 #
 #  Uncomment and set if desired
 #
 
 ## An ass repository is a nice thing to have. See README
-ass_repository := "$(HOME)/.cmp3ass"
+#ass_repository := "$(HOME)/.cmp3ass"
 
 ## Define this for bufferring or add other parameters to mpg123
-mpg123_params := -b 320
+#mpg123_params := -b 320
 
 # You need debugging info? Uncomment this and check /tmp/cmp3log
 #debugging := 1
@@ -38,8 +38,8 @@
 # stands. Change the code to do something else you want it to do...
 #PARAMS +=-DMY_CD
 LIBS= -lform -lncurses
-CFLAGS= -g -O -Inevlib
-CC= gcc
+CFLAGS+= -Inevlib
+CC?= gcc
 OBJS= cmp3common.o cmp3fileio.o cmp3manager.o cmp3curses.o \
       cmp3llist.o cmp3main.o cmp3listfiles.o cmp3playlist.o cmp3volume.o \
       cmp3general.o cmp3id3.o
@@ -78,7 +78,7 @@
 	$(CC) $(CFLAGS) $(OBJS) nevlib/libnev.a $(LIBS) -o cmp3
 
 lib:
-	@$(MAKE) -C nevlib lib
+	@$(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" -C nevlib lib 
 
 cleanlib:
 	@$(MAKE) -C nevlib clean