--- Makefile.orig	Fri Mar 26 16:08:33 1999
+++ Makefile	Sat Jul  1 17:43:08 2000
@@ -1,19 +1,20 @@
 CP=cp -f
 MKDIR=mkdir -p
 
-CFLAGS = -Wall -g
+CFLAGS?= -Wall -g
+PREFIX?= /usr/local
 
-GNOME_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""/usr/local/share/asclock"\" \
+GNOME_CC = $(CC) $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock/themes/"\" \
            -DASCLOCK_GNOME `gnome-config --cflags gnomeui gnome gtk`
 GNOME_OBJS = .gnome/draw.o .gnome/asclock.o .gnome/config.o .gnome/rot.o .gnome/parser.o \
 		.gnome/symbols.o .gnome/dialogs.o .gnome/timezone.o .gnome/gnome_config.o
 
 GNOME_LIBS = -lpanel -lpanel_applet `gnome-config --libs gnomeui gnome gtk gnorba`
 
-GTK_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""/usr/local/share/asclock"\" \
-	     -DASCLOCK_GTK `$(CONFIG_PATH)gtk-config --cflags`
+GTK_CC = $(CC) $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock/themes/"\" \
+	     -DASCLOCK_GTK `$(GTK_CONFIG) --cflags`
 GTK_OBJS = .gtk/draw.o .gtk/asclock.o .gtk/config.o .gtk/rot.o .gtk/parser.o .gtk/symbols.o
-GTK_LIBS = `$(CONFIG_PATH)gtk-config --libs`
+GTK_LIBS = `$(GTK_CONFIG) --libs`
 
 
 info:	default_theme
@@ -41,24 +42,24 @@
 	$(GTK_CC) $(GTK_LIBS) $(GTK_OBJS) -o asclock
 
 install: asclock
-	$(CP) asclock /usr/X11/bin
-	$(MKDIR) /usr/local/share/asclock
-	$(MKDIR) /usr/local/share/asclock/themes
-	$(MKDIR) /usr/local/share/asclock/themes/Newstone
-	$(CP) themes/Newstone/* /usr/local/share/asclock/themes/Newstone
-	$(MKDIR) /usr/local/share/asclock/themes/Orb
-	$(CP) themes/Orb/* /usr/local/share/asclock/themes/Orb
-	$(MKDIR) /usr/local/share/asclock/themes/Stone
-	$(CP) themes/Stone/* /usr/local/share/asclock/themes/Stone
-	$(MKDIR) /usr/local/share/asclock/themes/analog
-	$(CP) themes/analog/* /usr/local/share/asclock/themes/analog
-	$(MKDIR) /usr/local/share/asclock/themes/beats
-	$(CP) themes/beats/* /usr/local/share/asclock/themes/beats
-	$(MKDIR) /usr/local/share/asclock/themes/classic
-	$(CP) themes/classic/* /usr/local/share/asclock/themes/classic
-	$(MKDIR) /usr/local/share/asclock/themes/shaped
-	$(CP) themes/shaped/* /usr/local/share/asclock/themes/shaped
-#	$(CP) -rf themes/* /usr/local/share/asclock/
+	${BSD_INSTALL_PROGRAM} asclock ${PREFIX}/bin
+	$(MKDIR) ${PREFIX}/share/asclock
+	$(MKDIR) ${PREFIX}/share/asclock/themes
+	$(MKDIR) ${PREFIX}/share/asclock/themes/Newstone
+	${BSD_INSTALL_DATA} themes/Newstone/* ${PREFIX}/share/asclock/themes/Newstone
+	$(MKDIR) ${PREFIX}/share/asclock/themes/Orb
+	${BSD_INSTALL_DATA} themes/Orb/* ${PREFIX}/share/asclock/themes/Orb
+	$(MKDIR) ${PREFIX}/share/asclock/themes/Stone
+	${BSD_INSTALL_DATA} themes/Stone/* ${PREFIX}/share/asclock/themes/Stone
+	$(MKDIR) ${PREFIX}/share/asclock/themes/analog
+	${BSD_INSTALL_DATA} themes/analog/* ${PREFIX}/share/asclock/themes/analog
+	$(MKDIR) ${PREFIX}/share/asclock/themes/beats
+	${BSD_INSTALL_DATA} themes/beats/* ${PREFIX}/share/asclock/themes/beats
+	$(MKDIR) ${PREFIX}/share/asclock/themes/classic
+	${BSD_INSTALL_DATA} themes/classic/* ${PREFIX}/share/asclock/themes/classic
+	$(MKDIR) ${PREFIX}/share/asclock/themes/shaped
+	${BSD_INSTALL_DATA} themes/shaped/* ${PREFIX}/share/asclock/themes/shaped
+#	${BSD_INSTALL_DATA} -rf themes/* ${PREFIX}/share/asclock/
 
 clean: 
 	rm -rf core *.o *~ .gtk .gnome asclock asclock_applet