Refactor pieces into skel/ .

7 files changed, 19 insertions, 24 deletions

diff --git a/Makefile b/Makefile
index 5695840..35f5c82 100644
--- a/Makefile
+++ b/Makefile
@@ -11,11 +11,6 @@ RAKUDO_DIR  = $(DISTDIR)/rakudo
 BUILD_DIR   = $(DISTDIR)/build
 MODULES_DIR = $(DISTDIR)/modules
 
-BUILD_FILES = \
-  build/gen_parrot.pl \
-  build/module-install.pl \
-  build/Makefile.in \
-
 MODULES = \
   git://github.com/masak/ufo \
   git://github.com/masak/proto \
@@ -39,15 +34,20 @@ DISTTARGETS = \
   $(PARROT_DIR) \
   $(RAKUDO_DIR) \
   $(MODULES_DIR) \
-  $(BUILD_DIR) \
   $(BUILD_DIR)/PARROT_REVISION \
-  $(DISTDIR)/Configure.pl \
   $(DISTDIR)/MANIFEST \
 
-$(DISTDIR): version_check $(DISTTARGETS)
+dist: version_check $(DISTDIR) $(DISTTARGETS)
+
+version_check:
+	@[ -n "$(VERSION)" ] || ( echo "\nTry 'make VERSION=yyyy.mm'\n\n"; exit 1)
+
+always:
+
+$(DISTDIR):
+	cp -a skel $(DISTDIR)
 
 $(PARROT_DIR): $(PARROT_TGZ)
-	mkdir -p $(DISTDIR)
 	tar -C $(DISTDIR) -xvzf $(PARROT_TGZ)
 $(PARROT).tar.gz:
 	wget http://ftp.parrot.org/releases/supported/$(PARROT_VER)/$(PARROT_TGZ)
@@ -56,10 +56,6 @@ $(RAKUDO_DIR):
 	git clone git@github.com:rakudo/rakudo.git $(RAKUDO_DIR)
 	cd $(RAKUDO_DIR); git checkout $(RAKUDO_VER)
 
-$(BUILD_DIR): $(BUILD_FILES)
-	mkdir -p $(BUILD_DIR)
-	cp $(BUILD_FILES) $(BUILD_DIR)
-
 $(BUILD_DIR)/PARROT_REVISION: $(RAKUDO_DIR) $(RAKUDO_DIR)/build/PARROT_REVISION
 	cp $(RAKUDO_DIR)/build/PARROT_REVISION $(BUILD_DIR)
 
@@ -77,11 +73,6 @@ $(DISTDIR)/MANIFEST:
 	echo "$(PARROT)/.gitignore" >>$(DISTDIR)/MANIFEST
 	echo "$(PARROT)/tools/dev/.gdbinit" >>$(DISTDIR)/MANIFEST
 
-version_check:
-	@[ -n "$(VERSION)" ] || ( echo "\nTry 'make VERSION=yyyy.mm'\n\n"; exit 1)
-
-always:
-
 release: $(DISTDIR)
 	perl -ne 'print "$(DISTDIR)/$$_"' $(DISTDIR)/MANIFEST |\
 	    tar -zcv -T - -f $(DISTDIR).tar.gz
diff --git a/build/Configure.pl b/skel/Configure.pl
index a0e687e..a0e687e 100644
--- a/build/Configure.pl
+++ b/skel/Configure.pl
diff --git a/build/Makefile.in b/skel/build/Makefile.in
index 9c85fb5..f3666ae 100644
--- a/build/Makefile.in
+++ b/skel/build/Makefile.in
@@ -32,6 +32,7 @@ POD2MAN       = @pod2man@
 PARROT           = $(PARROT_BIN_DIR)/parrot$(EXE)
 NQP_EXE          = $(PARROT_BIN_DIR)/parrot-nqp$(EXE)
 PBC_TO_EXE       = $(PARROT_BIN_DIR)/pbc_to_exe$(EXE)
+PARROT_CONFIG    = $(PARROT_BIN_DIR)/parrot_config$(EXE)
 PARROT_TOOLS_DIR = $(PARROT_LIB_DIR)/tools
 PARROT_PERL_LIB  = $(PARROT_TOOLS_DIR)/lib
 OPS2C            = $(PARROT_BIN_DIR)/ops2c$(EXE)
@@ -69,18 +70,24 @@ all: rakudo
 
 rakudo: rakudo/$(PERL6_EXE)
 rakudo/$(PERL6_EXE):
-	cd rakudo && $(PERL) Configure.pl --parrot-config=$(PARROT_BIN_DIR)/parrot_config && $(MAKE)
+	cd rakudo && $(PERL) Configure.pl --parrot-config=$(PARROT_CONFIG) && $(MAKE)
 rakudo-test: rakudo/perl6
 	cd rakudo && $(MAKE) test
 rakudo-install: rakudo
 	cd rakudo && $(MAKE) install
 	$(CP) $(PARROT_BIN_DIR)/$(PERL6_EXE) .
+	$(CHMOD) 755 $(PERL6_EXE)
 
 modules-install:
 	@echo "Installing 'ufo'"
 	$(CP)    modules/ufo/ufo     $(PARROT_BIN_DIR)/ufo
 	$(CHMOD) 755                 $(PARROT_BIN_DIR)/ufo
-	$(PERL) build/module-install.pl $(PERL6_EXE) $(DESTDIR)$(PERL6_LANG_DIR)/lib $(MODULES)
+	$(PERL) build/module-install.pl $(PARROT_BIN_DIR)/$(PERL6_EXE) $(DESTDIR)$(PERL6_LANG_DIR)/lib $(MODULES)
+
+blizkost:
+	cd modules/blizkost && $(PERL) Configure.pl --parrot-config=$(PARROT_CONFIG) && $(MAKE)
+blizkost-install: blizkost
+	cd modules/blizkost && $(MAKE) install
 
 install: rakudo-install modules-install
 
@@ -102,9 +109,6 @@ help:
 	@echo ""
 	@echo "Following targets are available for the user:"
 	@echo ""
-	@echo "  all:               perl6.pbc"
-        @echo "  install:           Install stuff."
-	@echo ""
 	@echo "Maintenance:"
 	@echo "  perlcritic:        Run Perl::Critic on all the Perl 5 code."
 	@echo ""
@@ -123,7 +127,7 @@ config:
 
 $(PARROT):
 
-CRITIC_FILES=Configure.pl t/harness build/ tools/
+CRITIC_FILES=Configure.pl build/
 
 perlcritic:
 	perlcritic -1 --profile tools/util/perlcritic.conf $(CRITIC_FILES)
diff --git a/build/gen_parrot.pl b/skel/build/gen_parrot.pl
index b5faaa2..b5faaa2 100644
--- a/build/gen_parrot.pl
+++ b/skel/build/gen_parrot.pl
diff --git a/build/module-install.pl b/skel/build/module-install.pl
index cba32df..cba32df 100644
--- a/build/module-install.pl
+++ b/skel/build/module-install.pl
diff --git a/docs/announce/2010.07 b/skel/docs/announce/2010.07
index 321cb10..321cb10 100644
--- a/docs/announce/2010.07
+++ b/skel/docs/announce/2010.07
diff --git a/docs/external-documentation b/skel/docs/external-documentation
index d591479..d591479 100644
--- a/docs/external-documentation
+++ b/skel/docs/external-documentation