--- dox/Makefile.in.orig	Sun Jul 19 13:27:20 1998
+++ dox/Makefile.in	Sun Jul 19 13:29:46 1998
@@ -69,13 +69,13 @@
 
 dox_SOURCES =          \
 dox.c                  \
-INCLUDES=-DENLIGHTENMENT_ROOT=\"@prefix@/enlightenment\"
+INCLUDES=-DENLIGHTENMENT_ROOT=\"@prefix@/lib/X11/enlightenment\"
 
 PREFIX=@prefix@
 
 LDADD=@GX_LIBS@
 
-ebindir = $(prefix)/enlightenment/bin
+ebindir = $(prefix)/bin
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
@@ -343,15 +343,11 @@
 
 install-exec-hook:
 	./mkinstalldirs $(prefix)/bin
-	./mkinstalldirs $(prefix)/enlightenment/bin
-	./mkinstalldirs $(prefix)/enlightenment/config
-	cp -f ./$(bin_PROGRAMS) $(prefix)/enlightenment/bin/$(bin_PROGRAMS)
-	rm -f $(prefix)/bin/$(bin_PROGRAMS) 
-	ln -sf $(PREFIX)/enlightenment/bin/$(bin_PROGRAMS) $(prefix)/bin/$(bin_PROGRAMS) 
+	./mkinstalldirs $(prefix)/lib/X11/enlightenment/config
+	cp -f ./$(bin_PROGRAMS) $(prefix)/bin/$(bin_PROGRAMS)
 install-data-hook:
-	./mkinstalldirs $(prefix)/enlightenment/bin
-	./mkinstalldirs $(prefix)/enlightenment/config
-	cp -r E-docs    $(prefix)/enlightenment/
+	./mkinstalldirs $(prefix)/lib/X11/enlightenment/config
+	cp -r E-docs    $(prefix)/lib/X11/enlightenment/
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- src/Makefile.in.orig	Sun Jul 19 13:32:32 1998
+++ src/Makefile.in	Sun Jul 19 13:34:28 1998
@@ -104,7 +104,7 @@
 cmclass.c                \
 snprintf.c
 
-INCLUDES=-I$(includedir) -DENLIGHTENMENT_ROOT=\"@prefix@/enlightenment\"
+INCLUDES=-I$(includedir) -DENLIGHTENMENT_ROOT=\"@prefix@/lib/X11/enlightenment\"
 PREFIX=@prefix@
 
 LDADD=@GX_LIBS@
@@ -386,26 +386,21 @@
 ##########################
 
 install-exec-hook:
-	./mkinstalldirs $(prefix)/bin
-	./mkinstalldirs $(prefix)/enlightenment/bin
-	./mkinstalldirs $(prefix)/enlightenment/config
-	./mkinstalldirs $(prefix)/enlightenment/themes
-	cp -f ./$(bin_PROGRAMS) $(prefix)/enlightenment/bin/$(bin_PROGRAMS)
-	rm -f $(prefix)/bin/$(bin_PROGRAMS) 
-	ln -sf $(PREFIX)/enlightenment/bin/$(bin_PROGRAMS) $(prefix)/bin/$(bin_PROGRAMS) 
+	./mkinstalldirs $(prefix)/lib/X11/enlightenment/config
+	./mkinstalldirs $(prefix)/lib/X11/enlightenment/themes
+	cp -f ./$(bin_PROGRAMS) $(prefix)/bin/$(bin_PROGRAMS)
 
 #ebindir = $(prefix)/enlightenment/bin
 #ebin_DATA = enlightenment
 install-data-hook:
-	./mkinstalldirs $(prefix)/enlightenment/bin
-	./mkinstalldirs $(prefix)/enlightenment/config
-	$(INSTALL_DATA) configs/definitions $(prefix)/enlightenment/config/definitions
-	$(INSTALL_DATA) configs/theme_pre.cfg $(prefix)/enlightenment/config/theme_pre.cfg
-	$(INSTALL_DATA) configs/user_main.cfg $(prefix)/enlightenment/config/user_main.cfg
-	$(INSTALL_DATA) configs/theme_main.cfg $(prefix)/enlightenment/config/theme_main.cfg
-	cp -r pix    $(prefix)/enlightenment/config/
-	cp -r snd    $(prefix)/enlightenment/config/
-	cp -r tin-e  $(prefix)/enlightenment/config/
+	./mkinstalldirs $(prefix)/lib/X11/enlightenment/config
+	$(INSTALL_DATA) configs/definitions $(prefix)/lib/X11/enlightenment/config/definitions
+	$(INSTALL_DATA) configs/theme_pre.cfg $(prefix)/lib/X11/enlightenment/config/theme_pre.cfg
+	$(INSTALL_DATA) configs/user_main.cfg $(prefix)/lib/X11/enlightenment/config/user_main.cfg
+	$(INSTALL_DATA) configs/theme_main.cfg $(prefix)/lib/X11/enlightenment/config/theme_main.cfg
+	cp -r pix    $(prefix)/lib/X11/enlightenment/config/
+	cp -r snd    $(prefix)/lib/X11/enlightenment/config/
+	cp -r tin-e  $(prefix)/lib/X11/enlightenment/config/
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- configedit/Makefile.in.orig	Sun Jul 19 13:39:42 1998
+++ configedit/Makefile.in	Sun Jul 19 13:40:27 1998
@@ -236,15 +236,12 @@
 
 
 install-exec-hook:
-	./mkinstalldirs $(prefix)/enlightenment/bin
-	cp -f ./$(bin_SCRIPTS) $(prefix)/enlightenment/bin/$(bin_SCRIPTS)
-	rm -f $(prefix)/bin/$(bin_SCRIPTS) 
-	ln -sf $(PREFIX)/enlightenment/bin/$(bin_SCRIPTS) $(prefix)/bin/$(bin_SCRIPTS) 
+	cp -f ./$(bin_SCRIPTS) $(prefix)/bin/$(bin_SCRIPTS)
 
 install-data-hook:
-	./mkinstalldirs $(prefix)/enlightenment/config
-	cp configedit.gtkrc $(prefix)/enlightenment/config
-	cp configedit.rc $(prefix)/enlightenment/config
+	./mkinstalldirs $(prefix)/lib/X11/enlightenment/config
+	cp configedit.gtkrc $(prefix)/lib/X11/enlightenment/config
+	cp configedit.rc $(prefix)/lib/X11/enlightenment/config
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
