Remove the Makefile target and remove commented section
        from the root makefile.
        Add cardinal.install to languages.in
        Rename LANG to TMPL in all language makefiles.
        Conflicts with perl urmc locale.

The new compiler not yet.

--
Reini Urban
http://phpwiki.org/  http://murbreak.at/
2008-08-26 21:53:14 rurban

	Remove the Makefile target and remove commented section
        from the root makefile.
        Add cardinal.install to languages.in
        Rename LANG to TMPL in all language makefiles. Conflicts with perl 
        urmc locale.

Index: config/gen/makefiles/root.in
===================================================================
--- config/gen/makefiles/root.in	(revision 30547)
+++ config/gen/makefiles/root.in	(working copy)
@@ -550,7 +550,6 @@
 
 all : \
     flags_dummy \
-    Makefile \
     PARROT_LIBS \
     $(PARROT) \
     runtime/parrot/include/parrotlib.pbc \
@@ -623,10 +622,6 @@
 vtable.dump : src/vtable.tbl
 	$(PMC2CV)
 
-# regenerate the Makefile
-Makefile: config/gen/makefiles/root.in
-	$(RECONFIGURE) --step=gen::makefiles --target=Makefile
-
 # This is a listing of all targets meant to be called by users
 help :
 	@echo ""
@@ -1002,20 +997,6 @@
     lib/Parrot/OpsFile.pm lib/Parrot/Op.pm $(OPS_DIR)/ops.num $(OPS_DIR)/ops.skip
 	$(PERL) $(BUILD_TOOLS_DIR)/ops2pm.pl $(OPS_FILES)
 
-# FIXME: This creates a cycle sometimes
-#lib/Parrot/Config/Generated.pm \
-#    $(SRC_DIR)/platform.c \
-##CONDITIONED_LINE(platform_asm):    $(SRC_DIR)/platform_asm.s \
-##CONDITIONED_LINE(has_opengl):    config/gen/call_list/opengl.in \
-##CONDITIONED_LINE(has_glut):    $(SRC_DIR)/glut_callbacks.c \
-#    config_lib.pasm \
-#    $(BUILD_TOOLS_DIR)/dynpmc.pl \
-#    $(BUILD_TOOLS_DIR)/dynoplibs.pl \
-# : Configure.pl lib/Parrot/Configure.pm \
-#   lib/Parrot/Configure/Step/List.pm lib/Parrot/Configure/Step/Methods.pm
-#	@echo "  Makefile out-of-date: reconfigure"
-#	$(PERL) Configure.pl $(CONFIG_ARGS)
-
 ###############################################################################
 #
 # Examples (Assembly):
Index: config/gen/makefiles/languages.in
===================================================================
--- config/gen/makefiles/languages.in	(revision 30547)
+++ config/gen/makefiles/languages.in	(working copy)
@@ -322,6 +322,12 @@
 	- $(MAKE) cardinal
 cardinal.test:
 	- $(MAKE) cardinal test
+cardinal.installable:
+	- $(MAKE) cardinal installable
+cardinal.test-installable:
+	- $(MAKE) cardinal test-installable
+cardinal.install:
+	- $(MAKE) cardinal install
 cardinal.clean:
 	- $(MAKE) cardinal clean
 cardinal.realclean:
Index: languages/m4/config/makefiles/root.in
===================================================================
--- languages/m4/config/makefiles/root.in	(revision 30547)
+++ languages/m4/config/makefiles/root.in	(working copy)
@@ -1,7 +1,7 @@
 # $Id$
 
 # Makefile for languages/m4
-LANG          = m4
+TMPL          = m4
 
 # Setup of some commands
 PARROT        = ../../[EMAIL PROTECTED]@
@@ -72,22 +72,22 @@
 
 # TODO: rename build_dir. basic run for missing libs
 test-installable : installable
-	./installable_$(LANG)@exe@
+	./installable_$(TMPL)@exe@
 
 install : installable
-	$(CP) installable_$(LANG)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(LANG)@exe@
-	$(POD2MAN) pod/running.pod > $(DESTDIR)$(MANDIR)/man1/parrot-$(LANG).1
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	$(CP) $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	$(CP) installable_$(TMPL)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(TMPL)@exe@
+	$(POD2MAN) pod/running.pod > $(DESTDIR)$(MANDIR)/man1/parrot-$(TMPL).1
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	$(CP) $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
[EMAIL PROTECTED]@: $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc
[EMAIL PROTECTED]@: $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc
 
-installable : installable_$(LANG)@exe@
-	$(CP) installable_$(LANG)@exe@ $(BUILD_DIR)
+installable : installable_$(TMPL)@exe@
+	$(CP) installable_$(TMPL)@exe@ $(BUILD_DIR)
 
-installable_$(LANG)@exe@ : $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc --install
+installable_$(TMPL)@exe@ : $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc --install
 
 html: 
 	mkdir docs/html 
Index: languages/forth/config/makefiles/root.in
===================================================================
--- languages/forth/config/makefiles/root.in	(revision 30547)
+++ languages/forth/config/makefiles/root.in	(working copy)
@@ -1,6 +1,6 @@
 # $Id$
 
-LANG   = forth
+TMPL   = forth
 PERL   = @perl@
 RM_RF  = @rm_rf@
 PARROT        = ../../[EMAIL PROTECTED]@
@@ -30,7 +30,7 @@
 
 # regenerate the Makefile
 Makefile: config/makefiles/root.in
-	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(LANG)
+	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(TMPL)
 
 prompt: all
 	$(PARROT) forth.pbc
@@ -76,31 +76,31 @@
 
 # TODO: rename build_dir. basic run for missing libs
 test-installable : installable
-	echo "2-1" | ./installable_$(LANG)@exe@
+	echo "2-1" | ./installable_$(TMPL)@exe@
 
 install : installable
-	cp installable_$(LANG)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(LANG)@exe@
+	cp installable_$(TMPL)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(TMPL)@exe@
 	cp tokenstream.pbc $(DESTDIR)$(LIB_DIR)/parrot/library/forth_tokenstream.pbc
 	cp variablestack.pbc $(DESTDIR)$(LIB_DIR)/parrot/library/forth_variablestack.pbc
 	cp virtualstack.pbc $(DESTDIR)$(LIB_DIR)/parrot/library/forth_virtualstack.pbc
-	-mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	-mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
-$(LANG)@exe@: $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc
+$(TMPL)@exe@: $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc
 
-installable : installable_$(LANG)@exe@
-	cp installable_$(LANG)@exe@ $(BUILD_DIR)
+installable : installable_$(TMPL)@exe@
+	cp installable_$(TMPL)@exe@ $(BUILD_DIR)
 
-installable_$(LANG)@exe@ : $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc --install
+installable_$(TMPL)@exe@ : $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc --install
 
 testclean:
 
 CLEANUPS = \
-  installable_$(LANG)@exe@ \
+  installable_$(TMPL)@exe@ \
   *.pbc \
-  $(LANG)@exe@ \
+  $(TMPL)@exe@ \
 
 clean:
 	$(RM_RF) $(CLEANUPS)
Index: languages/unlambda/config/makefiles/root.in
===================================================================
--- languages/unlambda/config/makefiles/root.in	(revision 30547)
+++ languages/unlambda/config/makefiles/root.in	(working copy)
@@ -4,7 +4,7 @@
 # Makefile for languages/unlambda
 
 # configuration settings
-LANG	      = unlambda
+TMPL	      = unlambda
 BUILD_DIR     = @build_dir@
 LOAD_EXT      = @load_ext@
 O             = @o@
Index: languages/jako/config/makefiles/root.in
===================================================================
--- languages/jako/config/makefiles/root.in	(revision 30547)
+++ languages/jako/config/makefiles/root.in	(working copy)
@@ -4,7 +4,7 @@
 # $Id$
 #
 
-LANG          = jako
+TMPL          = jako
 BUILD_DIR     = @build_dir@
 LOAD_EXT      = @load_ext@
 O             = @o@
@@ -129,18 +129,18 @@
 
 # TODO: rename build_dir. basic run for missing libs
 test-installable : installable
-	echo "2-1" | ./installable_$(LANG)@exe@
+	echo "2-1" | ./installable_$(TMPL)@exe@
 
 install : installable
 	cp jako $(DESTDIR)$(BIN_DIR)/parrot-jako
 	cp jakoc $(DESTDIR)$(BIN_DIR)/parrot-jakoc
 	cp -R lib/Jako $(DESTDIR)$(PERLLIB_DIR)
-	$(POD2MAN) docs/jako.pod > $(DESTDIR)$(MANDIR)/man1/parrot-$(LANG).1
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)/examples
-	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	cp *.jako $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	cp examples/*.jako $(DESTDIR)$(DOC_DIR)/languages/$(LANG)/examples
+	$(POD2MAN) docs/jako.pod > $(DESTDIR)$(MANDIR)/man1/parrot-$(TMPL).1
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)/examples
+	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	cp *.jako $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	cp examples/*.jako $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)/examples
 
 installable : jako jakoc
 
Index: languages/bf/config/makefiles/root.in
===================================================================
--- languages/bf/config/makefiles/root.in	(revision 30547)
+++ languages/bf/config/makefiles/root.in	(working copy)
@@ -1,5 +1,5 @@
 # $Id$
-LANG = bf
+TMPL = bf
 BIN_DIR       = @bin_dir@
 LIB_DIR       = @lib_dir@
 DOC_DIR       = @doc_dir@
@@ -81,11 +81,11 @@
 	./[EMAIL PROTECTED]@ test.bf
 
 install : installable
-	cp installable_$(LANG)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(LANG)@exe@
+	cp installable_$(TMPL)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(TMPL)@exe@
 	cp [EMAIL PROTECTED]@ $(DESTDIR)$(BIN_DIR)/[EMAIL PROTECTED]@
 	cp [EMAIL PROTECTED]@ $(DESTDIR)$(BIN_DIR)/[EMAIL PROTECTED]@
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
 clean:
 	$(RM_F) core "*.pbc" "*~"
Index: languages/chitchat/config/makefiles/root.in
===================================================================
--- languages/chitchat/config/makefiles/root.in	(revision 30547)
+++ languages/chitchat/config/makefiles/root.in	(working copy)
@@ -4,7 +4,7 @@
 PARROT_ARGS =
 
 ## configuration settings
-LANG          = chitchat
+TMPL          = chitchat
 BUILD_DIR     = @build_dir@
 LOAD_EXT      = @load_ext@
 O             = @o@
@@ -65,7 +65,7 @@
 
 # regenerate the Makefile
 Makefile: config/makefiles/root.in
-	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(LANG)
+	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(TMPL)
 
 # This is a listing of all targets, that are meant to be called by users
 help:
@@ -96,22 +96,22 @@
 
 # TODO: rename build_dir. basic run for missing libs
 test-installable : installable
-	echo "2-1" | ./installable_$(LANG)@exe@
+	echo "2-1" | ./installable_$(TMPL)@exe@
 
 install : installable
-	cp installable_$(LANG)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(LANG)@exe@
-	$(POD2MAN) $(LANG).pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(LANG).1
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	cp installable_$(TMPL)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(TMPL)@exe@
+	$(POD2MAN) $(TMPL).pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(TMPL).1
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
-$(LANG)@exe@: $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc
+$(TMPL)@exe@: $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc
 
-installable : installable_$(LANG)@exe@
-	cp installable_$(LANG)@exe@ $(BUILD_DIR)
+installable : installable_$(TMPL)@exe@
+	cp installable_$(TMPL)@exe@ $(BUILD_DIR)
 
-installable_$(LANG)@exe@ : $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc --install
+installable_$(TMPL)@exe@ : $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc --install
 
 # this target has nothing to do
 testclean:
@@ -121,8 +121,8 @@
   src/gen_grammar.pir \
   src/gen_actions.pir \
   src/gen_builtins.pir \
-  $(LANG)@exe@ \
-  installable_$(LANG)@exe@ \
+  $(TMPL)@exe@ \
+  installable_$(TMPL)@exe@ \
 
 clean:
 	$(RM_RF) $(CLEANUPS)
Index: languages/perl6/config/makefiles/utils.in
===================================================================
--- languages/perl6/config/makefiles/utils.in	(revision 30547)
+++ languages/perl6/config/makefiles/utils.in	(working copy)
@@ -1,7 +1,7 @@
 # $Id$
 
 ## arguments we want to run parrot with
-LANG        = perl6doc
+TMPL        = perl6doc
 PARROT_ARGS =
 
 ## configuration settings
@@ -88,14 +88,14 @@
 	$(PBC_TO_EXE) perl6doc.pbc --install
 
 install : installable
-	cp installable_$(LANG)@exe@ $(DESTDIR)$(BIN_DIR)/$(LANG)@exe@
+	cp installable_$(TMPL)@exe@ $(DESTDIR)$(BIN_DIR)/$(TMPL)@exe@
 
-installable : installable_$(LANG)@exe@
-	cp installable_$(LANG)@exe@ $(BUILD_DIR)
+installable : installable_$(TMPL)@exe@
+	cp installable_$(TMPL)@exe@ $(BUILD_DIR)
 
 # TODO: rename build_dir. basic run for missing libs
 test-installable : installable
-	./installable_$(LANG)@exe@ -f 'test'
+	./installable_$(TMPL)@exe@ -f 'test'
 
 
 test: all
Index: languages/perl6/config/makefiles/root.in
===================================================================
--- languages/perl6/config/makefiles/root.in	(revision 30547)
+++ languages/perl6/config/makefiles/root.in	(working copy)
@@ -20,7 +20,7 @@
 MANDIR	      = @mandir@
 
 # Set up extensions
-LANG          = perl6
+TMPL          = perl6
 LOAD_EXT      = @load_ext@
 O             = @o@
 EXE           = @exe@
@@ -249,18 +249,18 @@
 
 # TODO: rename build_dir. basic run for missing libs
 test-installable : installable
-	./installable_$(LANG)@exe@ -e'say 1'
+	./installable_$(TMPL)@exe@ -e'say 1'
 
 install : installable
-	cp installable_$(LANG)@exe@ $(DESTDIR)$(BIN_DIR)/[EMAIL PROTECTED]@
+	cp installable_$(TMPL)@exe@ $(DESTDIR)$(BIN_DIR)/[EMAIL PROTECTED]@
 	@cd $(PMC_DIR) && $(BUILD_DYNPMC) copy "--destination=$(DESTDIR)$(LIB_DIR)/parrot/dynext" $(PMCS)
 	@cd $(OPSDIR)  && $(BUILD_DYNOPS) copy "--destination=$(DESTDIR)$(LIB_DIR)/parrot/dynext" $(OPSLIB)
 	pod2man doc/running.pod > $(DESTDIR)$(MANDIR)/man1/perl6.1
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
-installable : installable_$(LANG)@exe@ $(PERL6_GROUP)
-	cp installable_$(LANG)@exe@ $(BUILD_DIR)
+installable : installable_$(TMPL)@exe@ $(PERL6_GROUP)
+	cp installable_$(TMPL)@exe@ $(BUILD_DIR)
 	@cd $(PMC_DIR) && $(BUILD_DYNPMC) copy "--destination=$(PARROT_DYNEXT)" $(PMCS)
 	@cd $(OPSDIR)  && $(BUILD_DYNOPS) copy "--destination=$(PARROT_DYNEXT)" $(OPSLIB)
 
Index: languages/ecmascript/config/makefiles/root.in
===================================================================
--- languages/ecmascript/config/makefiles/root.in	(revision 30547)
+++ languages/ecmascript/config/makefiles/root.in	(working copy)
@@ -4,7 +4,7 @@
 PARROT_ARGS =
 
 ## configuration settings
-LANG          = ecmascript
+TMPL          = ecmascript
 BUILD_DIR     = @build_dir@
 LOAD_EXT      = @load_ext@
 O             = @o@
@@ -112,7 +112,7 @@
 
 # regenerate the Makefile
 Makefile: config/makefiles/root.in
-	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(LANG)
+	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(TMPL)
 
 # This is a listing of all targets, that are meant to be called by users
 help:
@@ -143,26 +143,26 @@
 
 # TODO: rename build_dir. basic run for missing libs
 test-installable : installable
-	echo "2-1" | ./installable_$(LANG)@exe@
+	echo "2-1" | ./installable_$(TMPL)@exe@
 
 install : installable
-	cp installable_$(LANG)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(LANG)@exe@
-	$(POD2MAN) $(LANG).pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(LANG).1
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	cp installable_$(TMPL)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(TMPL)@exe@
+	$(POD2MAN) $(TMPL).pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(TMPL).1
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
-$(LANG).pbc : js.pbc
-	$(CP) js.pbc $(LANG).pbc
+$(TMPL).pbc : js.pbc
+	$(CP) js.pbc $(TMPL).pbc
 
-$(LANG)@exe@: $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc
+$(TMPL)@exe@: $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc
 
-installable : installable_$(LANG)@exe@
-	cp installable_$(LANG)@exe@ $(BUILD_DIR)
+installable : installable_$(TMPL)@exe@
+	cp installable_$(TMPL)@exe@ $(BUILD_DIR)
 	cd $(PMC_DIR) && $(BUILD_DYNPMC) copy --destination=$(PARROT_DYNEXT) $(PMCS)
 
-installable_$(LANG)@exe@ : $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc --install
+installable_$(TMPL)@exe@ : $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc --install
 
 testclean:
 	$(RM_F) "t/*.js" "t/*.out"
@@ -170,9 +170,9 @@
 CLEANUPS = \
   js.pbc \
   [EMAIL PROTECTED]@ \
-  installable_$(LANG)@exe@ \
-  $(LANG).pbc \
-  $(LANG)@exe@ \
+  installable_$(TMPL)@exe@ \
+  $(TMPL).pbc \
+  $(TMPL)@exe@ \
   js.c \
   src/gen_grammar.pir \
   src/gen_actions.pir \
Index: languages/urm/config/makefiles/root.in
===================================================================
--- languages/urm/config/makefiles/root.in	(revision 30547)
+++ languages/urm/config/makefiles/root.in	(working copy)
@@ -1,7 +1,6 @@
 # $Id$
 
 # Makefile for languages/urm
-LANG          = urm
 
 # Setup of some commands
 RM_F          = @rm_f@
Index: languages/Zcode/config/makefiles/root.in
===================================================================
--- languages/Zcode/config/makefiles/root.in	(revision 30547)
+++ languages/Zcode/config/makefiles/root.in	(working copy)
@@ -1,7 +1,7 @@
 # $Id$
 
 # Makefile for languages/Zcode
-LANG	      = Zcode
+TMPL	      = Zcode
 
 # Setup of some commands
 BUILD_DIR  = @build_dir@
@@ -57,7 +57,7 @@
 
 # regenerate the Makefile
 Makefile: config/makefiles/root.in
-	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(LANG)
+	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(TMPL)
 
 clean:
 	@echo "No temp files to clean"
Index: languages/hq9plus/config/makefiles/root.in
===================================================================
--- languages/hq9plus/config/makefiles/root.in	(revision 30547)
+++ languages/hq9plus/config/makefiles/root.in	(working copy)
@@ -4,7 +4,7 @@
 PARROT_ARGS =
 
 ## configuration settings
-LANG          = hq9plus
+TMPL          = hq9plus
 BUILD_DIR     = @build_dir@
 BIN_DIR       = @bin_dir@
 LIB_DIR       = @lib_dir@
@@ -63,7 +63,7 @@
 
 # regenerate the Makefile
 Makefile: config/makefiles/root.in
-	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(LANG)
+	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(TMPL)
 
 # This is a listing of all targets, that are meant to be called by users
 help:
@@ -94,22 +94,22 @@
 
 # TODO: rename build_dir. basic run for missing libs
 test-installable : installable
-	./installable_$(LANG)@exe@
+	./installable_$(TMPL)@exe@
 
 install : installable
-	$(CP) installable_$(LANG)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(LANG)@exe@
-	$(POD2MAN) $(LANG).pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(LANG).1
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	$(CP) $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	$(CP) installable_$(TMPL)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(TMPL)@exe@
+	$(POD2MAN) $(TMPL).pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(TMPL).1
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	$(CP) $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
-$(LANG)@exe@: $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc
+$(TMPL)@exe@: $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc
 
-installable : installable_$(LANG)@exe@
-	cp installable_$(LANG)@exe@ $(BUILD_DIR)
+installable : installable_$(TMPL)@exe@
+	cp installable_$(TMPL)@exe@ $(BUILD_DIR)
 
-installable_$(LANG)@exe@ : $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc --install
+installable_$(TMPL)@exe@ : $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc --install
 
 # this target has nothing to do
 testclean:
Index: languages/lisp/config/makefiles/root.in
===================================================================
--- languages/lisp/config/makefiles/root.in	(revision 30547)
+++ languages/lisp/config/makefiles/root.in	(working copy)
@@ -4,7 +4,7 @@
 PARROT_ARGS =
 
 ## configuration settings
-LANG          = lisp
+TMPL          = lisp
 BUILD_DIR     = @build_dir@
 LOAD_EXT      = @load_ext@
 O             = @o@
@@ -34,7 +34,7 @@
 
 # regenerate the Makefile
 Makefile: config/makefiles/root.in
-	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(LANG)
+	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(TMPL)
 
 test: build
 	$(PERL) -Ilib -I../../lib t/harness
@@ -70,22 +70,22 @@
 
 # TODO: rename build_dir. basic run for missing libs
 test-installable : installable
-	./installable_$(LANG)@exe@
+	./installable_$(TMPL)@exe@
 
 install : installable
-	$(CP) installable_$(LANG)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(LANG)@exe@
-	$(POD2MAN) $(LANG).pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(LANG).1
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	$(CP) $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	$(CP) installable_$(TMPL)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(TMPL)@exe@
+	$(POD2MAN) $(TMPL).pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(TMPL).1
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	$(CP) $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
-$(LANG)@exe@: $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc
+$(TMPL)@exe@: $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc
 
-installable : installable_$(LANG)@exe@
-	$(CP) installable_$(LANG)@exe@ $(BUILD_DIR)
+installable : installable_$(TMPL)@exe@
+	$(CP) installable_$(TMPL)@exe@ $(BUILD_DIR)
 
-installable_$(LANG)@exe@ : $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc --install
+installable_$(TMPL)@exe@ : $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc --install
 
 clean: testclean
 	$(RM_F) core "*.pbc" "*~"
Index: languages/json/config/makefiles/root.in
===================================================================
--- languages/json/config/makefiles/root.in	(revision 30547)
+++ languages/json/config/makefiles/root.in	(working copy)
@@ -4,7 +4,7 @@
 PARROT_ARGS =
 
 ## configuration settings
-LANG          = json
+TMPL          = json
 BUILD_DIR     = @build_dir@
 LOAD_EXT      = @load_ext@
 O             = @o@
@@ -68,7 +68,7 @@
 
 # regenerate the Makefile
 Makefile: config/makefiles/root.in
-	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(LANG)
+	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(TMPL)
 
 # This is a listing of all targets, that are meant to be called by users
 help:
@@ -99,22 +99,22 @@
 
 # TODO: rename build_dir. basic run for missing libs
 test-installable : installable
-	./installable_$(LANG)@exe@
+	./installable_$(TMPL)@exe@
 
 install : installable
-	$(CP) installable_$(LANG)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(LANG)@exe@
-	$(POD2MAN) $(LANG).pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(LANG).1
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	$(CP) $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	$(CP) installable_$(TMPL)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(TMPL)@exe@
+	$(POD2MAN) $(TMPL).pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(TMPL).1
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	$(CP) $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
-$(LANG)@exe@: $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc
+$(TMPL)@exe@: $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc
 
-installable : installable_$(LANG)@exe@
-	$(CP) installable_$(LANG)@exe@ $(BUILD_DIR)
+installable : installable_$(TMPL)@exe@
+	$(CP) installable_$(TMPL)@exe@ $(BUILD_DIR)
 
-installable_$(LANG)@exe@ : $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc --install
+installable_$(TMPL)@exe@ : $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc --install
 
 # this target has nothing to do
 testclean:
Index: languages/APL/config/makefiles/root.in
===================================================================
--- languages/APL/config/makefiles/root.in	(revision 30547)
+++ languages/APL/config/makefiles/root.in	(working copy)
@@ -4,7 +4,7 @@
 PARROT_ARGS =
 
 ## configuration settings
-LANG	      = APL
+TMPL	      = APL
 BUILD_DIR     = @build_dir@
 LOAD_EXT      = @load_ext@
 O             = @o@
@@ -55,8 +55,8 @@
 APL.pbc: $(PARROT) $(SOURCES) $(APL_GROUP)
 	$(PARROT) $(PARROT_ARGS) -o APL.pbc APL.pir
 
-$(LANG)@exe@: $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc
+$(TMPL)@exe@: $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc
 
 src/gen_grammar.pir: $(PERL6GRAMMAR) src/parser/grammar.pg
 	$(PARROT) $(PARROT_ARGS) $(PERL6GRAMMAR) \
@@ -77,16 +77,16 @@
 	cd $(PMC_DIR) && $(BUILD_DYNPMC) linklibs $(PMCS)
 	cd $(PMC_DIR) && $(BUILD_DYNPMC) copy --destination=$(PARROT_DYNEXT) $(PMCS)
 
-installable : installable_$(LANG)@exe@ $(ABC_GROUP)
-	cp installable_$(LANG)@exe@ $(BUILD_DIR)
+installable : installable_$(TMPL)@exe@ $(ABC_GROUP)
+	cp installable_$(TMPL)@exe@ $(BUILD_DIR)
 	cd $(PMC_DIR) && $(BUILD_DYNPMC) copy --destination=$(PARROT_DYNEXT) $(PMCS)
 
-installable_$(LANG)@exe@: $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc --install
+installable_$(TMPL)@exe@: $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc --install
 
 # regenerate the Makefile
 Makefile: config/makefiles/root.in
-	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(LANG)
+	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(TMPL)
 
 # This is a listing of all targets, that are meant to be called by users
 help:
@@ -116,14 +116,14 @@
 
 # TODO: test for installed libs, rename build_dir. basic run for missing libs
 test-installable : installable
-	./installable_$(LANG)@exe@ demo.apl
+	./installable_$(TMPL)@exe@ demo.apl
 
 install : installable
-	cp installable_$(LANG)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(LANG)@exe@
+	cp installable_$(TMPL)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(TMPL)@exe@
 	cd $(PMC_DIR) && $(BUILD_DYNPMC) copy "--destination=$(DESTDIR)$(LIB_DIR)/parrot/dynext" $(PMCS)
-	pod2man $(LANG).pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(LANG).1
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	pod2man $(TMPL).pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(TMPL).1
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
 testclean:
 	$(RM_F) t/*.pir
@@ -143,8 +143,8 @@
   $(PMC_DIR)/*.manifest \
   $(PMC_DIR)/*.pdb \
   $(PMC_DIR)/*.lib \
-  $(LANG)@exe@ \
-  installable_$(LANG)@exe@ \
+  $(TMPL)@exe@ \
+  installable_$(TMPL)@exe@ \
 
 
 clean: testclean
Index: languages/cardinal/config/makefiles/root.in
===================================================================
--- languages/cardinal/config/makefiles/root.in	(revision 30547)
+++ languages/cardinal/config/makefiles/root.in	(working copy)
@@ -4,7 +4,7 @@
 PARROT_ARGS =
 
 ## configuration settings
-LANG          = cardinal
+TMPL          = cardinal
 BUILD_DIR     = @build_dir@
 LOAD_EXT      = @load_ext@
 O             = @o@
@@ -91,10 +91,10 @@
 
 # regenerate the Makefile
 Makefile: config/makefiles/root.in
-	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(LANG)
+	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(TMPL)
 
-installable : installable_$(LANG)@exe@
-	cp installable_$(LANG)@exe@ $(BUILD_DIR)
+installable : installable_$(TMPL)@exe@
+	cp installable_$(TMPL)@exe@ $(BUILD_DIR)
 
 # This is a listing of all targets, that are meant to be called by users
 help:
@@ -128,13 +128,13 @@
 
 # TODO: rename build_dir. basic run for missing libs
 test-installable : installable
-	./installable_$(LANG)@exe@ t/00-sanity.t
+	./installable_$(TMPL)@exe@ t/00-sanity.t
 
 install : installable
-	cp installable_$(LANG)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(LANG)@exe@
-	pod2man $(LANG).pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(LANG).1
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	cp installable_$(TMPL)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(TMPL)@exe@
+	pod2man $(TMPL).pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(TMPL).1
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
 CLEANUPS = \
   cardinal.pbc \
Index: languages/punie/config/makefiles/root.in
===================================================================
--- languages/punie/config/makefiles/root.in	(revision 30547)
+++ languages/punie/config/makefiles/root.in	(working copy)
@@ -1,7 +1,7 @@
 # $Id$
 
 # Setup some commands
-LANG     = punie
+TMPL     = punie
 LN_S     = @lns@
 PERL     = @perl@
 RM_F     = @rm_f@
@@ -71,26 +71,26 @@
 
 # regenerate the Makefile
 Makefile: config/makefiles/root.in
-	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(LANG)
+	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(TMPL)
 
 # TODO: rename build_dir. basic run for missing libs
 test-installable : installable
-	./installable_$(LANG)@exe@ demo.p1
+	./installable_$(TMPL)@exe@ demo.p1
 
 install : installable
-	$(CP) installable_$(LANG)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(LANG)@exe@
-	$(POD2MAN) punie.pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(LANG).1
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	$(CP) $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	$(CP) installable_$(TMPL)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(TMPL)@exe@
+	$(POD2MAN) punie.pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(TMPL).1
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	$(CP) $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
-$(LANG)@exe@: $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc
+$(TMPL)@exe@: $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc
 
-installable : installable_$(LANG)@exe@
-	$(CP) installable_$(LANG)@exe@ $(BUILD_DIR)
+installable : installable_$(TMPL)@exe@
+	$(CP) installable_$(TMPL)@exe@ $(BUILD_DIR)
 
-installable_$(LANG)@exe@ : $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc --install
+installable_$(TMPL)@exe@ : $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc --install
 
 testclean:
 	$(RM_F) "t/*.p1" "t/*.out" "t/*.pir"
Index: languages/lolcode/config/makefiles/root.in
===================================================================
--- languages/lolcode/config/makefiles/root.in	(revision 30547)
+++ languages/lolcode/config/makefiles/root.in	(working copy)
@@ -4,7 +4,7 @@
 PARROT_ARGS =
 
 ## configuration settings
-LANG          = lolcode
+TMPL          = lolcode
 BUILD_DIR     = @build_dir@
 LOAD_EXT      = @load_ext@
 O             = @o@
@@ -104,17 +104,17 @@
 
 # TODO: rename build_dir. basic run for missing libs
 test-installable : installable
-	./installable_$(LANG)@exe@ t/00-sanity.t
+	./installable_$(TMPL)@exe@ t/00-sanity.t
 
 install : installable
-	$(CP) installable_$(LANG)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(LANG)@exe@
-	$(POD2MAN) $(LANG).pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(LANG).1
+	$(CP) installable_$(TMPL)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(TMPL)@exe@
+	$(POD2MAN) $(TMPL).pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(TMPL).1
 
-installable : installable_$(LANG)@exe@
-	$(CP) installable_$(LANG)@exe@ $(BUILD_DIR)
+installable : installable_$(TMPL)@exe@
+	$(CP) installable_$(TMPL)@exe@ $(BUILD_DIR)
 
-installable_$(LANG)@exe@ : $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc --install
+installable_$(TMPL)@exe@ : $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc --install
 
 # this target has nothing to do
 testclean:
Index: languages/lua/config/makefiles/root.in
===================================================================
--- languages/lua/config/makefiles/root.in	(revision 30547)
+++ languages/lua/config/makefiles/root.in	(working copy)
@@ -2,7 +2,7 @@
 # $Id$
 
 ## configuration settings
-LANG     = lua
+TMPL     = lua
 O        = @o@
 LOAD_EXT = @load_ext@
 
@@ -128,14 +128,14 @@
 
 # TODO: rename build_dir. basic run for missing libs
 test-installable : installable
-	echo "a=1" | ./installable_$(LANG)@exe@
+	echo "a=1" | ./installable_$(TMPL)@exe@
 
 install : installable
-	cp installable_$(LANG)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(LANG)@exe@
+	cp installable_$(TMPL)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(TMPL)@exe@
 	@cd $(PMCDIR) && $(PMCBUILD) copy "--destination=$(DESTDIR)$(LIB_DIR)/parrot/dynext" $(PMCS)
-	pod2man doc/running.pod > $(DESTDIR)$(MANDIR)/man1/parrot-$(LANG).1
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	pod2man doc/running.pod > $(DESTDIR)$(MANDIR)/man1/parrot-$(TMPL).1
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
 src/lua51_testlex_gen.pir: src/lua51_testlex.pg
 	$(PGE) --output=src/lua51_testlex_gen.pir src/lua51_testlex.pg
@@ -266,7 +266,7 @@
 
 # regenerate the Makefile
 Makefile: config/makefiles/root.in
-	cd ../.. && $(RECONFIGURE) --step=gen::languages --languages=$(LANG)
+	cd ../.. && $(RECONFIGURE) --step=gen::languages --languages=$(TMPL)
 
 help:
 	@echo ""
@@ -319,7 +319,7 @@
  "$(PMCDIR)/*$(LOAD_EXT)" \
  "$(PMCDIR)/*$(O)" \
  "$(LIBPATH)/*.pbc" \
- installable_$(LANG)@exe@ \
+ installable_$(TMPL)@exe@ \
 
 clean:
 	$(RM_F) $(BUILD_CLEANERS) $(TEST_CLEANERS)
Index: languages/tcl/config/makefiles/root.in
===================================================================
--- languages/tcl/config/makefiles/root.in	(revision 30547)
+++ languages/tcl/config/makefiles/root.in	(working copy)
@@ -1,5 +1,5 @@
 # $Id$
-LANG    = tcl
+TMPL    = tcl
 RM_F    = @rm_f@
 PERL    = @perl@
 POD2MAN = pod2man
@@ -143,9 +143,9 @@
 	@cd $(OPSDIR) && $(OPSBUILD) copy "--destination=$(DESTDIR)$(LIB_DIR)/parrot/dynext" tcl
 	@cd $(PMCDIR) && $(PMCBUILD) copy "--destination=$(DESTDIR)$(LIB_DIR)/parrot/dynext" $(PMCS)
 	$(COPY) runtime/tcllib.pbc $(DESTDIR)$(LIB_DIR)/parrot/library
-	$(POD2MAN) README.pod > $(DESTDIR)$(MANDIR)/man1/parrot-$(LANG).1
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	$(COPY) $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	$(POD2MAN) README.pod > $(DESTDIR)$(MANDIR)/man1/parrot-$(TMPL).1
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	$(COPY) $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
 test: tcl.pbc
 	prove -r t
Index: languages/WMLScript/config/makefiles/root.in
===================================================================
--- languages/WMLScript/config/makefiles/root.in	(revision 30547)
+++ languages/WMLScript/config/makefiles/root.in	(working copy)
@@ -1,7 +1,7 @@
 # Copyright (C) 2006-2007, The Perl Foundation.
 # $Id$
 
-LANG    = WMLScript
+TMPL    = WMLScript
 RM_F    = @rm_f@
 PERL    = @perl@
 PARROT  = ../../[EMAIL PROTECTED]@
@@ -134,8 +134,8 @@
 	@cd $(PMCDIR) && $(PMCBUILD) copy "--destination=$(DESTDIR)$(LIB_DIR)/parrot/dynext" $(PMCS)
 	@cd $(OPSDIR) && $(OPSBUILD) copy "--destination=$(DESTDIR)$(LIB_DIR)/parrot/dynext" $(OPSLIB)
 	$(POD2MAN) pod/running.pod > $(DESTDIR)$(MANDIR)/man1/parrot-wmls.5
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	$(CP) $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	$(CP) $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
 installable: [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ \
              [EMAIL PROTECTED]@ [EMAIL PROTECTED]@
Index: languages/pynie/config/makefiles/root.in
===================================================================
--- languages/pynie/config/makefiles/root.in	(revision 30547)
+++ languages/pynie/config/makefiles/root.in	(working copy)
@@ -4,7 +4,7 @@
 PARROT_ARGS =
 
 ## configuration settings
-LANG          = pynie
+TMPL          = pynie
 BUILD_DIR     = @build_dir@
 LOAD_EXT      = @load_ext@
 O             = @o@
@@ -92,22 +92,22 @@
 
 # TODO: rename build_dir. basic run for missing libs
 test-installable : installable
-	./installable_$(LANG)@exe@ t/00-parrot/03-op-logic.t
+	./installable_$(TMPL)@exe@ t/00-parrot/03-op-logic.t
 
 install : installable
-	$(CP) installable_$(LANG)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(LANG)@exe@
-	$(POD2MAN) pynie.pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(LANG).1
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	$(CP) $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	$(CP) installable_$(TMPL)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(TMPL)@exe@
+	$(POD2MAN) pynie.pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(TMPL).1
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	$(CP) $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
-$(LANG)@exe@: $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc
+$(TMPL)@exe@: $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc
 
-installable : installable_$(LANG)@exe@
-	$(CP) installable_$(LANG)@exe@ $(BUILD_DIR)
+installable : installable_$(TMPL)@exe@
+	$(CP) installable_$(TMPL)@exe@ $(BUILD_DIR)
 
-installable_$(LANG)@exe@ : $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc --install
+installable_$(TMPL)@exe@ : $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc --install
 
 CLEANUPS = \
   pynie.pbc \
Index: languages/squaak/config/makefiles/root.in
===================================================================
--- languages/squaak/config/makefiles/root.in	(revision 30547)
+++ languages/squaak/config/makefiles/root.in	(working copy)
@@ -4,7 +4,7 @@
 PARROT_ARGS =
 
 ## configuration settings
-LANG          = squaak
+TMPL          = squaak
 BUILD_DIR     = @build_dir@
 LOAD_EXT      = @load_ext@
 O             = @o@
@@ -62,8 +62,8 @@
 squaak.pbc: $(PARROT) $(SOURCES)
 	$(PARROT) $(PARROT_ARGS) -o squaak.pbc squaak.pir
 
[EMAIL PROTECTED]@: $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc
[EMAIL PROTECTED]@: $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc
 
 src/gen_grammar.pir: $(PERL6GRAMMAR) src/parser/grammar.pg
 	$(PARROT) $(PARROT_ARGS) $(PERL6GRAMMAR) \
@@ -79,23 +79,23 @@
 
 # TODO: rename build_dir. basic run for missing libs
 test-installable : installable
-	./installable_$(LANG)@exe@
+	./installable_$(TMPL)@exe@
 
 install : installable
-	$(CP) installable_$(LANG)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(LANG)@exe@
-	$(POD2MAN) squaak.pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(LANG).1
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	$(CP) $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	$(CP) installable_$(TMPL)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(TMPL)@exe@
+	$(POD2MAN) squaak.pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(TMPL).1
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	$(CP) $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
-installable : installable_$(LANG)@exe@
-	$(CP) installable_$(LANG)@exe@ $(BUILD_DIR)
+installable : installable_$(TMPL)@exe@
+	$(CP) installable_$(TMPL)@exe@ $(BUILD_DIR)
 
-installable_$(LANG)@exe@ : $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc --install
+installable_$(TMPL)@exe@ : $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc --install
 
 # regenerate the Makefile
 Makefile: config/makefiles/root.in
-	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(LANG)
+	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(TMPL)
 
 # This is a listing of all targets, that are meant to be called by users
 help:
Index: languages/abc/config/makefiles/root.in
===================================================================
--- languages/abc/config/makefiles/root.in	(revision 30547)
+++ languages/abc/config/makefiles/root.in	(working copy)
@@ -4,7 +4,7 @@
 PARROT_ARGS =
 
 ## configuration settings
-LANG          = abc
+TMPL          = abc
 BUILD_DIR     = @build_dir@
 LOAD_EXT      = @load_ext@
 O             = @o@
@@ -51,8 +51,8 @@
 abc.pbc: $(PARROT) $(SOURCES)
 	$(PARROT) $(PARROT_ARGS) -o abc.pbc abc.pir
 
-$(LANG)@exe@: $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc
+$(TMPL)@exe@: $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc
 
 src/gen_grammar.pir: $(PERL6GRAMMAR) src/parser/grammar.pg src/parser/grammar-oper.pg
 	$(PARROT) $(PARROT_ARGS) $(PERL6GRAMMAR) \
@@ -67,15 +67,15 @@
 src/gen_builtins.pir: $(BUILTINS_PIR)
 	$(CAT) $(BUILTINS_PIR) >src/gen_builtins.pir
 
-installable : installable_$(LANG)@exe@
-	cp installable_$(LANG)@exe@ $(BUILD_DIR)
+installable : installable_$(TMPL)@exe@
+	cp installable_$(TMPL)@exe@ $(BUILD_DIR)
 
-installable_$(LANG)@exe@ : $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc --install
+installable_$(TMPL)@exe@ : $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc --install
 
 # regenerate the Makefile
 Makefile: config/makefiles/root.in
-	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(LANG)
+	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(TMPL)
 
 # This is a listing of all targets, that are meant to be called by users
 help:
@@ -106,13 +106,13 @@
 
 # TODO: rename build_dir. basic run for missing libs
 test-installable : installable
-	echo "2-1" | ./installable_$(LANG)@exe@
+	echo "2-1" | ./installable_$(TMPL)@exe@
 
 install : installable
-	cp installable_$(LANG)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(LANG)@exe@
-	pod2man $(LANG).pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(LANG).1
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	cp installable_$(TMPL)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(TMPL)@exe@
+	pod2man $(TMPL).pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(TMPL).1
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
 testclean:
 	$(RM_RF) "t/*.pir" "t/*.out"
@@ -122,8 +122,8 @@
   src/gen_grammar.pir \
   src/gen_actions.pir \
   src/gen_builtins.pir \
-  $(LANG)@exe@ \
-  installable_$(LANG)@exe@
+  $(TMPL)@exe@ \
+  installable_$(TMPL)@exe@
 
 clean: testclean
 	$(RM_RF) $(CLEANUPS)
Index: languages/ook/config/makefiles/root.in
===================================================================
--- languages/ook/config/makefiles/root.in	(revision 30547)
+++ languages/ook/config/makefiles/root.in	(working copy)
@@ -1,7 +1,7 @@
 # $Id$
 
 # Makefile for languages/ook
-LANG          = ook
+TMPL          = ook
 
 # Set up of commands
 PARROT        = ../../[EMAIL PROTECTED]@
@@ -42,7 +42,7 @@
 
 # regenerate the Makefile
 Makefile: config/makefiles/root.in
-	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(LANG)
+	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(TMPL)
 
 all: build
 
@@ -64,12 +64,12 @@
 
 # TODO: rename build_dir. basic run for missing libs
 test-installable : installable
-	./installable_$(LANG)@exe@ hello.ook
+	./installable_$(TMPL)@exe@ hello.ook
 
 install : installable
-	cp installable_$(LANG)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(LANG)@exe@
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	cp installable_$(TMPL)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(TMPL)@exe@
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
 clean:
 	$(RM_F) core \
Index: languages/pheme/config/makefiles/root.in
===================================================================
--- languages/pheme/config/makefiles/root.in	(revision 30547)
+++ languages/pheme/config/makefiles/root.in	(working copy)
@@ -1,7 +1,7 @@
 # $Id$
 
 # configuration settings
-LANG          = pheme
+TMPL          = pheme
 BUILD_DIR     = @build_dir@
 BIN_DIR       = @bin_dir@
 LIB_DIR       = @lib_dir@
@@ -82,16 +82,16 @@
 
 # TODO: rename build_dir. basic run for missing libs
 test-installable : installable
-	./installable_$(LANG)@exe@ -e'say 1'
+	./installable_$(TMPL)@exe@ -e'say 1'
 
 install : installable
-	cp installable_$(LANG)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(LANG)@exe@
-	pod2man $(LANG).pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(LANG).1
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	cp installable_$(TMPL)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(TMPL)@exe@
+	pod2man $(TMPL).pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(TMPL).1
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
-installable : installable_$(LANG)@exe@
-	cp installable_$(LANG)@exe@ $(BUILD_DIR)
+installable : installable_$(TMPL)@exe@
+	cp installable_$(TMPL)@exe@ $(BUILD_DIR)
 
 clean: testclean
 	$(RM_F) pheme.pbc
Index: languages/c99/config/makefiles/cpp.in
===================================================================
--- languages/c99/config/makefiles/cpp.in	(revision 30547)
+++ languages/c99/config/makefiles/cpp.in	(working copy)
@@ -4,7 +4,7 @@
 PARROT_ARGS =
 
 ## configuration settings
-LANG          = cpp
+TMPL          = cpp
 BUILD_DIR     = @build_dir@
 LOAD_EXT      = @load_ext@
 O             = @o@
Index: languages/c99/config/makefiles/root.in
===================================================================
--- languages/c99/config/makefiles/root.in	(revision 30547)
+++ languages/c99/config/makefiles/root.in	(working copy)
@@ -4,7 +4,7 @@
 PARROT_ARGS =
 
 ## configuration settings
-LANG	      = c99
+TMPL	      = c99
 BUILD_DIR     = @build_dir@
 LOAD_EXT      = @load_ext@
 O             = @o@
@@ -113,16 +113,16 @@
 
 # TODO: rename build_dir. basic run for missing libs
 test-installable : installable
-	./installable_$(LANG)@exe@ t/spi.t
+	./installable_$(TMPL)@exe@ t/spi.t
 	./[EMAIL PROTECTED]@ t/spi.t
 
 install : installable
-	cp installable_$(LANG)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(LANG)@exe@
+	cp installable_$(TMPL)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(TMPL)@exe@
 	cp [EMAIL PROTECTED]@ $(DESTDIR)$(BIN_DIR)/[EMAIL PROTECTED]@
-	$(POD2MAN) $(LANG).pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(LANG).1
+	$(POD2MAN) $(TMPL).pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(TMPL).1
 	$(POD2MAN) src/cpp/cpp.pir > $(DESTDIR)$(MANDIR)/man1/parrot-cpp.1
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
 # this target has nothing to do
 testclean:
Index: languages/scheme/config/makefiles/root.in
===================================================================
--- languages/scheme/config/makefiles/root.in	(revision 30547)
+++ languages/scheme/config/makefiles/root.in	(working copy)
@@ -2,7 +2,7 @@
 # $Id$
 
 # Makefile for languages/scheme
-LANG          = scheme
+TMPL          = scheme
 
 # Set up commands
 PERL          = @perl@
@@ -39,7 +39,7 @@
 
 # regenerate the Makefile
 Makefile: config/makefiles/root.in
-	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(LANG)
+	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(TMPL)
 
 # Compilation:
 build:
@@ -52,8 +52,8 @@
 #	$(CP) lib/Scheme/*.pm $(DESTDIR)$(LIB_DIR)/Scheme
 install : installable
 	$(CP) schemec $(DESTDIR)$(BIN_DIR)/parrot-schemec
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	$(CP) $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	$(CP) $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
 # cleaning up
 
Index: languages/lazy-k/config/makefiles/root.in
===================================================================
--- languages/lazy-k/config/makefiles/root.in	(revision 30547)
+++ languages/lazy-k/config/makefiles/root.in	(working copy)
@@ -1,7 +1,7 @@
 # $Id$
 
 # Makefile for languages/lazy-k
-LANG          = lazy-k
+TMPL          = lazy-k
 
 # Setup of some commands
 PARROT        = @build_dir@/[EMAIL PROTECTED]@
@@ -51,36 +51,36 @@
 
 # regenerate the Makefile
 Makefile: config/makefiles/root.in
-	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(LANG)
+	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(TMPL)
 
 test: all
 	cd .. && $(PERL) t/harness --languages=lazy-k
 
 # TODO: rename build_dir. basic run for missing libs
 test-installable : installable
-	echo '1+2*3' |  ./installable_$(LANG)@exe@ calc.lazy
+	echo '1+2*3' |  ./installable_$(TMPL)@exe@ calc.lazy
 
 install : installable
-	cp installable_$(LANG)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(LANG)@exe@
-	$(POD2MAN) $(LANG).pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(LANG).1
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	cp installable_$(TMPL)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(TMPL)@exe@
+	$(POD2MAN) $(TMPL).pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(TMPL).1
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
-$(LANG)@exe@: $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc
+$(TMPL)@exe@: $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc
 
-installable : installable_$(LANG)@exe@
-	cp installable_$(LANG)@exe@ $(BUILD_DIR)
+installable : installable_$(TMPL)@exe@
+	cp installable_$(TMPL)@exe@ $(BUILD_DIR)
 	cd $(PMC_DIR) && $(BUILD_DYNPMC) copy --destination=$(PARROT_DYNEXT) $(PMCS)
 
-installable_$(LANG)@exe@ : $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc --install
+installable_$(TMPL)@exe@ : $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc --install
 
 clean:
 	$(RM_F) core \
     "*.pbc" \
     "*~" \
-    "installable_$(LANG)@exe@"
+    "installable_$(TMPL)@exe@"
 
 realclean: clean
 	$(RM_F) Makefile
Index: languages/eclectus/config/makefiles/root.in
===================================================================
--- languages/eclectus/config/makefiles/root.in	(revision 30547)
+++ languages/eclectus/config/makefiles/root.in	(working copy)
@@ -4,7 +4,7 @@
 # Makefile for languages/eclectus
 
 # configuration settings
-LANG          = eclectus
+TMPL          = eclectus
 BUILD_DIR     = @build_dir@
 LOAD_EXT      = @load_ext@
 O             = @o@
@@ -76,7 +76,7 @@
 
 # regenerate the Makefile
 Makefile: config/makefiles/root.in
-	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(LANG)
+	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(TMPL)
 
 # Compilation:
 build: $(ECLECTUS_GROUP) driver_nqp.pbc
@@ -95,25 +95,25 @@
 
 # TODO: rename build_dir. basic run for missing libs
 test-installable : installable
-	./installable_$(LANG)@exe@ tests-driver.scm
+	./installable_$(TMPL)@exe@ tests-driver.scm
 
 install : installable
-	$(CP) installable_$(LANG)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(LANG)@exe@
+	$(CP) installable_$(TMPL)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(TMPL)@exe@
 	cd $(PMC_DIR) && $(BUILD_DYNPMC) copy "--destination=$(DESTDIR)$(LIB_DIR)/parrot/dynext" $(PMCS)
-	$(POD2MAN) docs/eclectus.pod > $(DESTDIR)$(MANDIR)/man1/parrot-$(LANG).1
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	$(CP) $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	$(POD2MAN) docs/eclectus.pod > $(DESTDIR)$(MANDIR)/man1/parrot-$(TMPL).1
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	$(CP) $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
-$(LANG)@exe@: driver_nqp.pbc
+$(TMPL)@exe@: driver_nqp.pbc
 	$(PBC_TO_EXE) driver_nqp.pbc
-	mv [EMAIL PROTECTED]@ $(LANG)@exe@
+	mv [EMAIL PROTECTED]@ $(TMPL)@exe@
 
-installable : installable_$(LANG)@exe@ $(ECLECTUS_GROUP)
-	$(CP) installable_$(LANG)@exe@ $(BUILD_DIR)
+installable : installable_$(TMPL)@exe@ $(ECLECTUS_GROUP)
+	$(CP) installable_$(TMPL)@exe@ $(BUILD_DIR)
 
-installable_$(LANG)@exe@ : driver_nqp.pbc
+installable_$(TMPL)@exe@ : driver_nqp.pbc
 	$(PBC_TO_EXE) driver_nqp.pbc --install
-	mv [EMAIL PROTECTED]@ installable_$(LANG)@exe@
+	mv [EMAIL PROTECTED]@ installable_$(TMPL)@exe@
 
 
 # cleaning up
@@ -136,8 +136,8 @@
   $(PMC_DIR)/*.manifest \
   $(PMC_DIR)/*.pdb \
   $(PMC_DIR)/*.lib \
-  installable_$(LANG)@exe@ \
-  $(LANG)@exe@ \
+  installable_$(TMPL)@exe@ \
+  $(TMPL)@exe@ \
 
 realclean: clean
 	$(RM_F) Makefile
Index: languages/pipp/config/makefiles/root.in
===================================================================
--- languages/pipp/config/makefiles/root.in	(revision 30547)
+++ languages/pipp/config/makefiles/root.in	(working copy)
@@ -1,7 +1,7 @@
 # $Id$
 
 # Set up extensions
-LANG          = pipp
+TMPL          = pipp
 LOAD_EXT      = @load_ext@
 O             = @o@
 EXE           = @exe@
@@ -224,15 +224,15 @@
 	@cd $(PMCDIR) && $(PMCBUILD) linklibs $(PMCS)
 	@cd $(PMCDIR) && $(PMCBUILD) copy "--destination=$(PARROT_DYNEXT)" $(PMCS)
 
-installable : installable_$(LANG)@exe@ pmc
-	cp installable_$(LANG)@exe@ $(BUILD_DIR)
+installable : installable_$(TMPL)@exe@ pmc
+	cp installable_$(TMPL)@exe@ $(BUILD_DIR)
 
 install : installable
-	cp installable_$(LANG)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(LANG)@exe@
+	cp installable_$(TMPL)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(TMPL)@exe@
 	@cd $(PMCDIR) && $(PMCBUILD) copy "--destination=$(DESTDIR)$(LIB_DIR)/parrot/dynext" $(PMCS)
 	cp src/common/pipplib.pbc $(PHP_EXT) $(DESTDIR)$(LIB_DIR)/parrot/library
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
 
 test:     all test-pct
Index: languages/befunge/config/makefiles/root.in
===================================================================
--- languages/befunge/config/makefiles/root.in	(revision 30547)
+++ languages/befunge/config/makefiles/root.in	(working copy)
@@ -1,7 +1,7 @@
 # $Id$
 
 # Makefile for languages/befunge
-LANG = befunge
+TMPL = befunge
 
 ## configuration settings
 BUILD_DIR     = @build_dir@
@@ -55,32 +55,32 @@
 
 # regenerate the Makefile
 Makefile: config/makefiles/root.in
-	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(LANG)
+	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(TMPL)
 
-installable_$(LANG)@exe@: $(LANG).pbc
-	$(PBC_TO_EXE) $(LANG).pbc --install
+installable_$(TMPL)@exe@: $(TMPL).pbc
+	$(PBC_TO_EXE) $(TMPL).pbc --install
 
-installable : installable_$(LANG)@exe@
-	cp installable_$(LANG)@exe@ $(BUILD_DIR)
+installable : installable_$(TMPL)@exe@
+	cp installable_$(TMPL)@exe@ $(BUILD_DIR)
 
 test: befunge.pbc
-	cd .. && $(PERL) t/harness --languages=$(LANG)
+	cd .. && $(PERL) t/harness --languages=$(TMPL)
 
 # TODO: rename build_dir. basic run for missing libs
 test-installable : installable
-	./installable_$(LANG)@exe@ test.bef
+	./installable_$(TMPL)@exe@ test.bef
 
 install : installable
-	cp installable_$(LANG)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(LANG)@exe@
-	$(POD2MAN) $(LANG).pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(LANG).1
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	cp installable_$(TMPL)@exe@ $(DESTDIR)$(BIN_DIR)/parrot-$(TMPL)@exe@
+	$(POD2MAN) $(TMPL).pir > $(DESTDIR)$(MANDIR)/man1/parrot-$(TMPL).1
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
 clean:
 	$(RM_F) core \
     "*.pbc" \
     "*~" \
-    "installable_$(LANG)@exe@"
+    "installable_$(TMPL)@exe@"
 
 realclean: clean
 	$(RM_F) Makefile
Index: languages/cola/config/makefiles/root.in
===================================================================
--- languages/cola/config/makefiles/root.in	(revision 30547)
+++ languages/cola/config/makefiles/root.in	(working copy)
@@ -3,7 +3,7 @@
 # Makefile for languages/cola
 
 ## configuration settings
-LANG          = cola
+TMPL          = cola
 BUILD_DIR     = @build_dir@
 O             = @o@
 EXE           = @exe@
@@ -78,7 +78,7 @@
 
 # regenerate the Makefile
 Makefile: config/makefiles/root.in
-	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(LANG)
+	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=$(TMPL)
 
 nogen : gen$(O) semant$(O) sym$(O) type$(O)
 	$(CC) $(DEBUG) -c parser.c
@@ -137,7 +137,7 @@
 	$(CC) $(DEBUG) -o colacc$(EXE) parser$(O) lexer$(O) gen$(O) semant$(O) sym$(O) type$(O) $(LIBS)
 
 test: default
-	cd .. && $(PERL) t/harness --languages=$(LANG)
+	cd .. && $(PERL) t/harness --languages=$(TMPL)
 
 # TODO: rename build_dir. basic run for missing libs
 test-installable : installable
@@ -146,8 +146,8 @@
 install : installable
 	cp colacc$(EXE) $(DESTDIR)$(BIN_DIR)/parrot-colacc$(EXE)
 	ascii2man README > $(DESTDIR)$(MANDIR)/man1/parrot-colacc.1
-	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
-	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(LANG)
+	mkdir $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
+	cp $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/$(TMPL)
 
 installable : colacc$(EXE)
 	cp colacc$(EXE) $(BUILD_DIR)/installable_colacc$(EXE)

Reply via email to