X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=configure.ac;h=0d9f5fd5b0a1a51895463a199c2154464f24bba0;hp=f75ce600c01e9e91031fce1641953c3cdc6d8648;hb=5918751f97a3eb976a7b24647786109edc58234c;hpb=a31d65a998121df0651c57bfb68782e2a07d2e2f

diff --git a/configure.ac b/configure.ac
index f75ce60..0d9f5fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,8 @@ AC_PROG_INSTALL
 AC_PROG_RANLIB
 AM_PROG_CC_C_O
 
+AC_PATH_PROGS([DOXYGEN], [doxygen])
+AC_SUBST(DOXYGEN)
 
 #
 # Configure platform-specific stuff.
@@ -55,8 +57,6 @@ case "${host}" in
 	;;
 	*-linux-gnu*)
 		LINUX=yes
-		AC_PATH_PROGS([RPMBUILD], [rpmbuild])
-		AC_SUBST(RPMBUILD)
 	;;
 esac
 
@@ -148,7 +148,7 @@ if test x$WIN32 = xyes
 then
 	DATADIR="data"
 else
-	eval eval DATADIR="${datadir}/yoink"
+	eval eval DATADIR="${datadir}/$PACKAGE"
 fi
 
 AC_SUBST([DATADIR])
@@ -308,14 +308,18 @@ AC_SUBST([DATA_FILES])
 # Create the build files.
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+if test x$WIN32 = xyes
+then
+	make_win32="win32/Makefile win32/build-installer.sh"
+else
+	make_doc="doc/Makefile doc/yoink.6"
+fi
+
 AC_CONFIG_FILES([Makefile
 				 data/Makefile
-				 doc/Makefile
-				 doc/yoink.6
-				 extra/Makefile
-				 extra/yoink.spec
-				 make-win32-installer.sh
-                 src/Makefile])
+				 src/Makefile
+				 $make_doc
+				 $make_win32])
 
 AC_CONFIG_HEADERS([src/config.h])