X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=7668c7d21b81f6162b092df5ea31f9e3c9f6ef29;hb=21c6e3305ac119156f522754937daa11935d843a;hp=38085adf683f17aa60887f9ac7640e2dc65af0f0;hpb=5a5ec028298e695f117f56b458e6dfce2005b50e;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 38085adf68..7668c7d21b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
 AC_INIT(LyX,1.6.0svn,[lyx-devel@lists.lyx.org],[lyx])
-AC_SUBST(LYX_DATE, ["Fri, Aug 1, 2008"])
+AC_SUBST(LYX_DATE, ["Thu, Aug 28, 2008"])
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([config.h])
@@ -313,6 +313,7 @@ AC_SUBST(AM_CPPFLAGS)
 AC_SUBST(AM_CXXFLAGS)
 AC_SUBST(AM_CFLAGS)
 AC_SUBST(AM_LDFLAGS)
+AC_SUBST(real_pkgdatadir)
 
 ## Some config.h stuff
 
@@ -389,11 +390,6 @@ char * strerror(int n);
 ])
 
 
-AC_ARG_WITH(qmake,
-	AC_HELP_STRING([--with-qmake],
-		[Use qmake instead of automake to generate Makefiles]),,
-	[with_qmake=no])
-
 AC_ARG_ENABLE(monolithic-boost,
   AC_HELP_STRING([--enable-monolithic-boost],
 		[Use monolithic boost compilations]),,
@@ -458,7 +454,8 @@ AC_DEFINE_UNQUOTED([LYX_MINOR_VERSION],$lyx_minor,[Minor version number])
 AC_DEFINE_UNQUOTED([LYX_RELEASE_LEVEL],$lyx_release,[Release version number])
 AC_DEFINE_UNQUOTED([LYX_RELEASE_PATCH],$lyx_patch,[Patch version number])
 
-AC_CONFIG_FILES([Makefile
+AC_CONFIG_FILES([Makefile \
+      lyx.1:lyx.1in \
       boost/Makefile \
       config/Makefile \
       development/Makefile \
@@ -487,30 +484,6 @@ AC_CONFIG_FILES([Makefile
 
 AC_OUTPUT
 
-if test x$with_qmake = xyes ; then
-	echo "CONFIGURE WITH QMAKE ONLY"
-	if test x$srcdir = x ; then
-		echo "ONLY FOR OUT-OF-TREE-BUILDS POSSIBLE"
-	else
-		rm boost/Makefile
-		rm src/client/Makefile
-		rm src/Makefile
-		rm src/tex2lyx/Makefile
-		rm src/support/Makefile
-		rm src/frontends/Makefile
-		rm src/frontends/qt4/Makefile
-		rm -rf boost/.deps
-		rm -rf src/client/.deps
-		rm -rf src/.deps
-		rm -rf src/tex2lyx/.deps
-		rm -rf src/support/.deps
-		rm -rf src/frontends/.deps
-		rm -rf src/frontends/qt4/.deps
-		${srcdir}/development/qmake/doit
-	fi
-fi
-
-
 # show version information
 echo
 printf "$VERSION_INFO"