--- Makefile.orig	2007-04-27 21:08:11.000000000 -0400
+++ Makefile	2007-04-27 21:09:05.000000000 -0400
@@ -45,11 +45,11 @@
 INSTALL_BLURB_4 = \
 "To reset the default fonts for a user, run '$(MAKE) default-default' as that user."
 
-
+include $(GNUSTEP_MAKEFILES)/common.make
 
 .PHONY: all help
 
-all:: check_GNUstep_sh_sourced
+all:: 
 	@(echo "-art resource package version 0.1  Alexander Malmberg <alexander@malmberg.org>"; \
 	echo; \
 	echo "This package contains:"; \
@@ -74,7 +74,7 @@
 	echo "but you can also run '$(MAKE) help' for more extensive information."; \
 	)
 
-help:: check_GNUstep_sh_sourced
+help:: 
 	@(echo "Use:"; \
 	echo; \
 	echo "$(MAKE) install"; \
@@ -94,7 +94,7 @@
 	echo "standard make commands."; \
 	)
 
-install:: check_GNUstep_sh_sourced install-vera install-freefonts
+install::  install-vera install-freefonts
 	@(if ! ($(MAKE) -C mknfonts && $(MAKE) -C mknfonts install); then \
 		echo; \
 		echo "The automatic install of mknfonts failed. To do it manually,"; \
@@ -113,49 +113,40 @@
 	)
 
 
-FONT_DEST = $(GNUSTEP_LOCAL_ROOT)/Library/Fonts
+FONT_DEST = $(GNUSTEP_LIBRARY)/Fonts
 
 
 .PHONY: install-vera install-freefonts
 
-install-vera:: check_GNUstep_sh_sourced
+install-vera:: 
 	@echo Installing the Vera fonts...
 	@./install-nfont Vera\ Sans.nfont $(FONT_DEST) FoO
 	@./install-nfont Vera\ Serif.nfont $(FONT_DEST) FoO
 	@./install-nfont Vera\ Sans\ Mono.nfont $(FONT_DEST) FoO
 
-install-freefonts:: check_GNUstep_sh_sourced
+install-freefonts:: 
 	@echo Installing the FreeFonts...
 	@./install-nfont FreeSans.nfont $(FONT_DEST) FoO
 	@./install-nfont FreeSerif.nfont $(FONT_DEST) FoO
 	@./install-nfont FreeMono.nfont $(FONT_DEST) FoO
 	
 
-vera-default:: check_GNUstep_sh_sourced
+vera-default:: 
 	defaults write NSGlobalDomain NSFont BitstreamVeraSans-Roman
 	defaults write NSGlobalDomain NSBoldFont BitstreamVeraSans-Bold
 	defaults write NSGlobalDomain NSUserFixedPitchFont BitstreamVeraSansMono-Roman
 
-freefonts-default:: check_GNUstep_sh_sourced
+freefonts-default:: 
 	defaults write NSGlobalDomain NSFont FreeSans
 	defaults write NSGlobalDomain NSBoldFont FreeSansBold
 	defaults write NSGlobalDomain NSUserFixedPitchFont FreeMono
 
-default-default:: check_GNUstep_sh_sourced
+default-default:: 
 	defaults delete NSGlobalDomain NSFont
 	defaults delete NSGlobalDomain NSBoldFont
 	defaults delete NSGlobalDomain NSUserFixedPitchFont
 
 
-.PHONY: check_GNUstep_sh_sourced
-ifeq ($(GNUSTEP_ROOT),)
-check_GNUstep_sh_sourced::
-	@echo You must source the GNUstep.sh script before running $(MAKE) here.
-	@false
-else
-check_GNUstep_sh_sourced::
-endif
-
 
 VERSION = 0.1.2