X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=configure;h=8c88e5bbb72917cce7472d6dcb48151e57e1dc2d;hp=5e691c171eacb6b4b11a9f02aba5e4285de63638;hb=a97500609dc3c1b11f9786d32bc458eb00de4c36;hpb=bd62b2e6a6e5f1af5a635df3ff1a07f363d9ffe0

diff --git a/configure b/configure
index 5e691c1..8c88e5b 100755
--- a/configure
+++ b/configure
@@ -6,7 +6,6 @@
 --
 
 project		= "Yoink"
-package		= project:lower()
 version		= "0.1"
 bugreport	= "chaz@dogcows.com"
 
@@ -40,7 +39,7 @@ Program options:
       --enable-threads    use threads for concurrency
       --enable-hotloading watch assets for automatic reloading
 
-      --with-gtk          use gtk2 toolkit (overrides --with-qt4)
+      --with-gtk          use the gtk2 toolkit (overrides --with-qt4)
       --with-qt4          use the qt4 gui toolkit
 ]])
 end
@@ -187,8 +186,11 @@ do
 
 	-- Define the dependent values.
 	
-	if not host then host = ReadCommand("build/config.guess") end
-	alt_host = ReadCommand("build/config.sub "..host)
+	package	= project:lower()
+	tarname	= package.."-"..version
+
+	if not host then host = ReadCommand("tools/config.guess") end
+	alt_host = ReadCommand("tools/config.sub "..host)
 
 	if not eprefix			then eprefix		= prefix end
 	if not bindir			then bindir			= eprefix.."/bin" end
@@ -263,7 +265,8 @@ int main()
 {
 	printf("Hello world!\n");
 	return 0;
-}]])
+}
+]])
 	tmpfile:close()
 
 	function extra() if not cross_compile then return "gcc", "cc" end end
@@ -291,7 +294,8 @@ int main()
 {
 	std::cout << "Hello world!" << std::endl;
 	return 0;
-}]])
+}
+]])
 	tmpfile:close()
 
 	function extra() if not cross_compile then return "g++", "c++" end end
@@ -454,7 +458,7 @@ end
 
 do
 	-- Determine and define the git revision.
-	local head = ReadCommand("git log -n1 --date=short --pretty=format:\"%h (%ad)\"")
+	local head = ReadCommand("git describe master")
 	config.YOINK_GITHEAD = head
 end
 
@@ -465,22 +469,26 @@ config.PACKAGE_VERSION		= version
 config.PACKAGE_STRING		= project.." "..version
 config.PACKAGE_BUGREPORT	= bugreport
 
-define.TARGET		= host
-define.PLATFORM		= platform
-define.CC			= CC
-define.CXX			= CXX
-define.AR			= AR
-define.RANLIB		= RANLIB
-define.WINDRES		= WINDRES
-define.CFLAGS		= CFLAGS
-define.CXXFLAGS		= CXXFLAGS
-define.LDFLAGS		= LDFLAGS
-define.LIBS			= LIBS
-define.prefix		= prefix
-define.bindir		= bindir
-define.datadir		= datadir
-define.mandir		= mandir
-define.EXEEXT		= exe_extension
+define.PACKAGE				= project
+define.TARNAME				= tarname
+define.TARGET				= host
+define.PLATFORM				= platform
+define.CC					= CC
+define.CXX					= CXX
+define.AR					= AR
+define.RANLIB				= RANLIB
+define.WINDRES				= WINDRES
+define.CFLAGS				= CFLAGS
+define.CXXFLAGS				= CXXFLAGS
+define.LDFLAGS				= LDFLAGS
+define.LIBS					= LIBS
+define.prefix				= prefix
+define.bindir				= bindir
+define.datadir				= datadir
+define.mandir				= mandir
+define.EXEEXT				= exe_extension
+
+export.PACKAGE_BUGREPORT	= bugreport
 
 
 --