$NetBSD$
--- Makefile.in.orig	Sat Feb 19 14:15:49 2000
+++ Makefile.in	Thu Aug 31 14:44:28 2000
@@ -15,7 +15,7 @@
 bindir = $(exec_prefix)/bin
 
 # Directory in which to install library files.
-libdir = $(prefix)/lib/dotfile-$(version)
+libdir = $(prefix)/share/dotfile-$(version)
 # Directory for the manual page
 mandir = $(prefix)/man/man1
 
@@ -23,28 +23,13 @@
 SHELL = /bin/sh
 
 ### Tell the user that there is nothing to be compiled.
-.PHONY: nothing
 nothing:
-	@echo ----------------------------------------------------------------------
-	@echo ----------------------------------------------------------------------
-	@echo "The Dotfile Generator does not contain any files which has to be compiled!"
-	@echo "On the other hand, during installation, all the modules need to be"
-	@echo "bytecompiled, so now it's time to type: make install"
-	@echo ----------------------------------------------------------------------
-	@echo ----------------------------------------------------------------------
 
 #
 # install all the files in the corect places.
 #
-.PHONY:	install
 install: copydirs bytecompile
-	@echo "**********************************************************************"
-	@echo In the directory Doc, three articles in HTML format, concerning
-	@echo The Dotfile Generator is located. If you want these to be installed
-	@echo on your system, please do it manually.
-	@echo "**********************************************************************"
 
-.PHONY: copydirs
 copydirs:
 	$(SHELL) $(srcdir)/mkinstalldirs $(bindir) $(libdir) \
 	$(libdir)/Generator $(mandir)
@@ -62,28 +47,16 @@
 	chmod 755 $(bindir)/dotfile
 	chmod 755 $(bindir)/dotfile-$(version)
 
-.PHONY: bytecompile
 bytecompile: $(MODULES)
 
 #
 # Targets that requre X (the modules using the fonts widget)
 #
-.PHONY english/fvwm1 english/fvwm2 japanese/fvwm1 japanese/fvwm2:
 english/fvwm1 english/fvwm2 japanese/fvwm1 japanese/fvwm2:
-	@echo "----------------------------------------------------------------------"
-	@echo "                           Byte compiling $@"
-	@if wish testwish; then \
-	@WISH@ $(libdir)/Generator/dotfile.tcl $(libdir)/Generator $(libdir) $@ bytecompile; \
-	else \
-	echo "An error should be shown above!"; \
-	echo "You need X to bytecompile the $@ module, do this manually after"; \
-	echo "the installation, by starting this module!"; \
-	fi
 
 #
 # Targets that may bytecompile without X
 #
-.PHONY english/emacs english/tcsh english/rtin english/bash english/elm english/procmail english/ipfwadm japanese/canna:
 english/emacs english/tcsh english/rtin english/bash english/elm english/procmail english/ipfwadm japanese/canna:
 	@echo "----------------------------------------------------------------------"
 	@echo "                           Byte compiling $@"
@@ -93,7 +66,6 @@
 # Targets that may bytecompile without X, but which requieres
 # Japanese Tcl/Tk.
 #
-#.PHONY japanese/canna japanese/fvwm1 japanese/fvwm2:
 #japanese/canna japanese/fvwm1 japanese/fvwm2:
 #	@echo "----------------------------------------------------------------------"
 #	@echo "                           Byte compiling $@"
@@ -106,6 +78,5 @@
 #
 # Clean
 #
-.PHONY:	clean
 clean :
 	@echo Nothing to do
