From e3085adf83eaedabfee5ce6af2f6e34443e1eaca Mon Sep 17 00:00:00 2001
From: neoraider <devnull@localhost>
Date: Fri, 15 Jun 2007 20:52:01 +0000
Subject: zoom: Fixed some Makefile bugs.

---
 Makefile.am  |  8 ++------
 Makefile.in  | 14 +++++++-------
 configure    |  3 +++
 configure.in |  2 +-
 zoom.in      |  2 +-
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 86d6dff..061186b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,13 +9,9 @@ zoom_bin_SOURCES     = zoom-bin.c
 zoom_bin_CFLAGS      = @libzoom_CFLAGS@
 zoom_bin_LDADD       = @libzoom_LIBS@
 
-EXTRA_DIST = zoom levels/level.dtd levels/level.xml tex/*
+EXTRA_DIST           = levels/level.dtd levels/*.xml tex/*
+CLEANFILES           = levels/*.lvl
 
 
-zoom: zoom.in
-	sed -e 's&@gamedir@&$(gamedir)&' < zoom.in > zoom
-	chmod +x zoom
-
 .xml.lvl:
 	gzip -cn9 $< > $@
-	
\ No newline at end of file
diff --git a/Makefile.in b/Makefile.in
index 491f629..66ee075 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,7 +35,7 @@ POST_UNINSTALL = :
 nobase_game_PROGRAMS = zoom-bin$(EXEEXT)
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
+	$(srcdir)/Makefile.in $(srcdir)/config.h.in $(srcdir)/zoom.in \
 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
 	compile depcomp install-sh missing mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -46,7 +46,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = zoom
 am__installdirs = "$(DESTDIR)$(gamedir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(gamedir)"
 nobase_gamePROGRAMS_INSTALL = $(install_sh_PROGRAM)
@@ -179,7 +179,8 @@ nobase_game_DATA = levels/level.dtd levels/level.lvl tex/*
 zoom_bin_SOURCES = zoom-bin.c
 zoom_bin_CFLAGS = @libzoom_CFLAGS@
 zoom_bin_LDADD = @libzoom_LIBS@
-EXTRA_DIST = zoom levels/level.dtd levels/level.xml tex/*
+EXTRA_DIST = levels/level.dtd levels/*.xml tex/*
+CLEANFILES = levels/*.lvl
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -235,6 +236,8 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
+zoom: $(top_builddir)/config.status $(srcdir)/zoom.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-nobase_gamePROGRAMS: $(nobase_game_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(gamedir)" || $(MKDIR_P) "$(DESTDIR)$(gamedir)"
@@ -535,6 +538,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -623,10 +627,6 @@ uninstall-am: uninstall-binSCRIPTS uninstall-nobase_gameDATA \
 	uninstall-nobase_gameDATA uninstall-nobase_gamePROGRAMS
 
 
-zoom: zoom.in
-	sed -e 's&@gamedir@&$(gamedir)&' < zoom.in > zoom
-	chmod +x zoom
-
 .xml.lvl:
 	gzip -cn9 $< > $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/configure b/configure
index 9dc2da0..f445935 100755
--- a/configure
+++ b/configure
@@ -3787,6 +3787,8 @@ done
 
 ac_config_files="$ac_config_files Makefile"
 
+ac_config_files="$ac_config_files zoom"
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -4374,6 +4376,7 @@ do
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "zoom") CONFIG_FILES="$CONFIG_FILES zoom" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
diff --git a/configure.in b/configure.in
index c044e41..0a69da8 100644
--- a/configure.in
+++ b/configure.in
@@ -26,4 +26,4 @@ AC_HEADER_TIME
 AC_CHECK_FUNCS([gettimeofday])
 
 AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
+AC_OUTPUT([zoom])
diff --git a/zoom.in b/zoom.in
index 01c79af..cca4a0a 100644
--- a/zoom.in
+++ b/zoom.in
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-cd @gamedir@
+cd @prefix@/games/zoom
 exec ./zoom-bin
-- 
cgit v1.2.3