--- Makefile.orig	Mon Oct 23 14:21:41 2000
+++ Makefile	Thu Nov 16 11:12:35 2000
@@ -4,11 +4,13 @@
 # Edit the entries below for your system:
 # In most cases you don't have to
 
-PREFIX		= `gtk-config --prefix`
+PREFIX		?= `gtk-config --prefix`
 
-CC		= gcc
-CFLAGS		= `gtk-config --cflags`
-LIBS		= `gtk-config --libs`
+CC		?= gcc
+_CFLAGS		!= $(GTK_CONFIG) --cflags
+_LIBS		!= $(GTK_CONFIG) --libs
+CFLAGS		+= $(_CFLAGS)
+LIBS		+= $(_LIBS)
 
 #Use these for FreeBSD:
 #PREFIX		= `gtk12-config --prefix`
@@ -26,8 +28,8 @@
 DATA_PATH	= $(PREFIX)/share/themes
 
 OBJECTS		= XenoStep_theme_draw.o XenoStep_theme_main.o XenoStep_theme_patches.o XenoStep_theme_color.o
-SONAME		= libXenoStep.so.0.1
-SHORTNAME	= libXenoStep.so.0
+SONAME		= libXenoStep.so
+SHORTNAME	= libXenoStep.so
 TINYNAME	= libXenoStep.so
 OLDNAME		= libXenoStep.so.0.1
 
@@ -36,18 +38,20 @@
 		$(LINK) $(GTKLIBS) $(OBJECTS) -shared -Wl,-soname,$(SHORTNAME) -o $(SONAME)
 
 install-libs:	$(SONAME)
-		chmod 755 $(SONAME)
-		cp $(SONAME) $(LIB_PATH)
-		ln -fs $(SONAME) $(LIB_PATH)/$(SHORTNAME)
-		ln -fs $(SONAME) $(LIB_PATH)/$(TINYNAME)
+#		chmod 755 $(SONAME)
+#		cp $(SONAME) $(LIB_PATH)
+#		ln -fs $(SONAME) $(LIB_PATH)/$(SHORTNAME)
+#		ln -fs $(SONAME) $(LIB_PATH)/$(TINYNAME)
+		$(BSD_INSTALL_PROGRAM) $(SONAME) $(LIB_PATH)/$(SONAME)
 
 install-data:
-		cp -fR XenoStep\ Classic $(DATA_PATH)
-		cp -fR XenoStep\ Modern $(DATA_PATH)
-		cp -fR XenoStep\ HeliX $(DATA_PATH)
-		cp -fR XenoStep\ Classic\ Small $(DATA_PATH)
-		cp -fR XenoStep\ Modern\ Small $(DATA_PATH)
-		cp -fR XenoStep\ HeliX\ Small $(DATA_PATH)
+		for dir in XenoStep_Classic XenoStep_Modern XenoStep_HeliX \
+		    XenoStep_Classic_Small XenoStep_Modern_Small \
+		    XenoStep_HeliX_Small; do \
+			$(MKDIR) $(DATA_PATH)/$${dir}/gtk; \
+			$(BSD_INSTALL_DATA) $${dir}/gtk/gtkrc $(DATA_PATH)/$${dir}/gtk; \
+			$(BSD_INSTALL_DATA) $${dir}/[^g]* $(DATA_PATH)/$${dir}; \
+		done
 
 install:	install-libs install-data