From f00a8372e0503272cbff64b41956e2d7c15e9a24 Mon Sep 17 00:00:00 2001 From: roland Date: Mon, 25 Jul 2005 19:30:44 +0000 Subject: 2005-07-25 Roland McGrath * configure.ac: Don't define PKGLIBDIR and PKGDATADIR here. * Makefile.am (AM_CPPFLAGS): New variable, use -D here instead. (dist-hook): Don't remove ChangeLog files. (install-data-local): Don't install docs, just runtime stuff. (rpm, clean-local): Use make variables instead of @substitution@s. * configure, config.in, aclocal.m4, Makefile.in: Regenerated --- configure | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'configure') diff --git a/configure b/configure index cdf2ac9e..93fe0bec 100755 --- a/configure +++ b/configure @@ -310,7 +310,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP U ANSI2KNR RANLIB ac_ct_RANLIB CXXCPP DATE PKGLIBDIR PKGDATADIR LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP U ANSI2KNR RANLIB ac_ct_RANLIB CXXCPP DATE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -5692,27 +5692,6 @@ _ACEOF - -# wha?? autoconf 2.59 does not expand these in the expected way -# my_libexecdir=`eval echo $libexecdir` -# my_libexecdir="$libexecdir" - -my_pkglibdir=${prefix}/libexec/systemtap - -cat >>confdefs.h <<_ACEOF -#define PKGLIBDIR "$my_pkglibdir" -_ACEOF - - - -my_pkgdatadir=${prefix}/share/systemtap - -cat >>confdefs.h <<_ACEOF -#define PKGDATADIR "$my_pkgdatadir" -_ACEOF - - - ac_config_headers="$ac_config_headers config.h:config.in" ac_config_files="$ac_config_files Makefile systemtap.spec" @@ -6432,8 +6411,6 @@ s,@RANLIB@,$RANLIB,;t t s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t s,@CXXCPP@,$CXXCPP,;t t s,@DATE@,$DATE,;t t -s,@PKGLIBDIR@,$PKGLIBDIR,;t t -s,@PKGDATADIR@,$PKGDATADIR,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF -- cgit