From: Russ Allbery Date: Wed, 11 Nov 2009 00:27:57 +0000 (-0800) Subject: Revert to upstream configs/Makefile.in X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=c540d1f4f2b9dddc660e598facb6fcd74be080cf;hp=a715303c4670e28e677df553ef4ea33b67f0645c;p=shibboleth%2Fsp.git Revert to upstream configs/Makefile.in We rebuild all the Makefile.in files using automake during the build anyway, so no need to ship a diff to a Makefile.in as part of the package. --- diff --git a/configs/Makefile.in b/configs/Makefile.in index 3563195..e621f3c 100644 --- a/configs/Makefile.in +++ b/configs/Makefile.in @@ -162,7 +162,6 @@ FASTCGI_INCLUDE = @FASTCGI_INCLUDE@ FASTCGI_LDFLAGS = @FASTCGI_LDFLAGS@ FASTCGI_LIBS = @FASTCGI_LIBS@ FFLAGS = @FFLAGS@ -GREP = @GREP@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -205,9 +204,21 @@ VERSION = @VERSION@ WANT_SUBDIRS = @WANT_SUBDIRS@ XMLSEC_LIBS = @XMLSEC_LIBS@ XMLTOOLINGXMLDIR = @XMLTOOLINGXMLDIR@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +ac_pt_DX_DOT = @ac_pt_DX_DOT@ +ac_pt_DX_DOXYGEN = @ac_pt_DX_DOXYGEN@ +ac_pt_DX_DVIPS = @ac_pt_DX_DVIPS@ +ac_pt_DX_EGREP = @ac_pt_DX_EGREP@ +ac_pt_DX_HHC = @ac_pt_DX_HHC@ +ac_pt_DX_LATEX = @ac_pt_DX_LATEX@ +ac_pt_DX_MAKEINDEX = @ac_pt_DX_MAKEINDEX@ +ac_pt_DX_PDFLATEX = @ac_pt_DX_PDFLATEX@ +ac_pt_DX_PERL = @ac_pt_DX_PERL@ acx_pthread_config = @acx_pthread_config@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ @@ -225,30 +236,23 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ -localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ -psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ @@ -256,8 +260,8 @@ target_alias = @target_alias@ xs = @xs@ AUTOMAKE_OPTIONS = foreign pkglogdir = ${localstatedir}/log/@PACKAGE@ -pkgdocdir = ${datadir}/doc/@PACKAGE@ -shirelogdir = ${localstatedir}/log/apache2 +pkgdocdir = $(datadir)/doc/@PACKAGE@-@PACKAGE_VERSION@ +shirelogdir = ${localstatedir}/log/httpd pkgxmldir = $(datadir)/xml/@PACKAGE@ pkgrundir = $(localstatedir)/run/@PACKAGE@ pkgsysconfdir = $(sysconfdir)/@PACKAGE@