From 5bc07f4446bec6dea5faa1e16a436403ff05acf1 Mon Sep 17 00:00:00 2001
From: ZipFile <lin.aaa.lin@gmail.com>
Date: Mon, 10 Oct 2011 00:21:53 +0200
Subject: [PATCH 1/2] Fix that makeinstall bug.

---
 Makefile.am | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index dc643eeddf..9dc4b489ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,6 +13,8 @@ if HAVE_GTK
 installFiles += src/GtkModule.so
 endif
 
+installData = $(srcdir)/Announcers $(srcdir)/BGAnimations $(srcdir)/Themes $(srcdir)/Characters $(srcdir)/Scripts $(srcdir)/Courses $(srcdir)/BackgroundEffects $(srcdir)/Data $(srcdir)/BackgroundTransitions $(srcdir)/Docs $(srcdir)/NoteSkins
+
 .PHONY: SMData
 SMData:
 	$(srcdir)/Utils/CreatePackage.pl $(srcdir) .
@@ -20,16 +22,18 @@ SMData:
 dist-hook: SMData
 	mkdir -p $(distdir)/Packages
 	cp GameData.smzip $(distdir)/Packages
-	mkdir -p $(distdir)/Docs
-	cp $(srcdir)/Docs/Licenses.txt $(distdir)/Docs
-	cp $(srcdir)/Utils/build.sh $(distdir)
+	cp -r $(srcdir)/Docs $(distdir)
+	cp -r -t "$(distdir)" $(installFiles)
 
-install-data-hook: $(top_srcdir)/Packages/GameData.smzip
-	mkdir -p "$(DESTDIR)$(bindir)/$(productID)/Packages"
-	$(INSTALL) $(installFiles) "$(DESTDIR)$(bindir)/$(productID)"
-	$(INSTALL_DATA) $(top_srcdir)/Packages/GameData.smzip "$(DESTDIR)$(bindir)/$(productID)/Packages"
+install-exec-hook:
+	mkdir -p "$(prefix)/$(productID)"
+	$(INSTALL) $(installFiles) "$(prefix)/$(productID)"
+
+install-data-local:
+	cp -r -t "$(prefix)/$(productID)" $(installData)
+	mkdir -p "$(prefix)/$(productID)/Songs"
 
 uninstall-hook:
-	rm -f "$(DESTDIR)$(bindir)/$(productID)/stepmania"
-	rm -f "$(DESTDIR)$(bindir)/$(productID)/GtkModule.so"
-	rm -f "$(DESTDIR)$(bindir)/$(productID)/Packages/GameData.smzip"
+	rm -f "$(prefix)/$(productID)/stepmania"
+	rm -f "$(prefix)/$(productID)/GtkModule.so"
+# todo: properly remove data

From a1744eb712f985bca5abe74d93a0354df4c28b1d Mon Sep 17 00:00:00 2001
From: ZipFile <lin.aaa.lin@gmail.com>
Date: Mon, 10 Oct 2011 00:36:16 +0200
Subject: [PATCH 2/2] Fix smdata generator due new makefile.

---
 Makefile.am    | 2 +-
 Utils/build.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9dc4b489ca..f39d0f24ec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@ SMData:
 
 dist-hook: SMData
 	mkdir -p $(distdir)/Packages
-	cp GameData.smzip $(distdir)/Packages
+	mv GameData.smzip $(distdir)/Packages
 	cp -r $(srcdir)/Docs $(distdir)
 	cp -r -t "$(distdir)" $(installFiles)
 
diff --git a/Utils/build.sh b/Utils/build.sh
index 12c37f0e2f..00b07d4884 100755
--- a/Utils/build.sh
+++ b/Utils/build.sh
@@ -111,7 +111,7 @@ call () {
 }
 
 version () {
-	echo 'build.sh (StepMania) 2.63'
+	echo 'build.sh (StepMania) 2.64'
 	echo 'Copyright (C) 2006-2009 Steve Checkoway'
 	echo 'StepMania is Copyright (C) 2001-2011 Chris Danford et al.'
 	echo 'sm-ssc is Copyright (C) 2009-2011 the spinal shark collective'
@@ -122,7 +122,7 @@ if [ -n "$s_data" ]; then
 	message 'Generating GameData.smzip'
 	if [ -f _build/Makefile ]; then
 		cd _build
-		call make dist-hook
+		call make SMData
 		mv ./GameData.smzip ../
 		cd ..
 	else