Index: libraries/Makefile.in
--- libraries/Makefile.in.orig	2006-08-10 19:31:47 +0200
+++ libraries/Makefile.in	2006-09-22 07:55:38 +0200
@@ -164,12 +164,10 @@
 	(echo '#! /bin/sh'; \
 	 echo 'runhugs $(hugsdir)/programs/cpphs/Main.hs "$$@"') >$(DESTDIR)$(bindir)/cpphs-hugs
 	chmod 755 $(DESTDIR)$(bindir)/cpphs-hugs
-# install template file where hsc2hs-hugs expects to find it
-	hsc2hs_data=`sed -n 's/^datadir *= "\(.*\)"/\1/p' $(BUILD_DIR)/programs/hsc2hs/Paths_hsc2hs.hs`; \
-	  $(INSTALL) -d $(DESTDIR)$$hsc2hs_data; \
-	  $(INSTALL) -c -m 0644 ../hsc2hs/template-hsc.h $(DESTDIR)$$hsc2hs_data/template-hsc.h
+	$(INSTALL) -d $(DESTDIR)$(hugsdir)/programs/hsc2hs
+	$(INSTALL) -c -m 0644 ../hsc2hs/template-hsc.h $(DESTDIR)$(hugsdir)/hsc2hs/template-hsc.h
 	(echo '#! /bin/sh'; \
-	 echo 'runhugs -98 $(hugsdir)/programs/hsc2hs/Main.hs -I$(hugsdir)/include "$$@"') >$(DESTDIR)$(bindir)/hsc2hs-hugs
+	 echo 'runhugs -98 $(hugsdir)/programs/hsc2hs/Main.hs -I$(hugsdir)/include -t$(hugsdir)/hsc2hs/template-hsc.h "$$@"') >$(DESTDIR)$(bindir)/hsc2hs-hugs
 	chmod 755 $(DESTDIR)$(bindir)/hsc2hs-hugs
 
 LibStatus: $(LIBS)
Index: src/interns.c
--- src/interns.c.orig	2003-11-19 22:49:48 +0100
+++ src/interns.c	2006-09-22 07:51:56 +0200
@@ -21,8 +21,8 @@
 
 static Void linkInternals Args((Void));
 
-static Name nameLeft;			/* standard data constructors      */
-static Name nameRight;			
+Name nameLeft;			/* standard data constructors      */
+Name nameRight;			
 
 static Void local internalControl Args((Int));
 static Void local internalControl(what)