git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2497
cb58f699-b61c-0410-a6fe-
9272a202ed29
}
# Find appropriate versions of the auto tools
}
# Find appropriate versions of the auto tools
-find_program aclocal 1.7
+find_program aclocal 1.9
aclocal="$program"
find_program autoheader 2.53
autoheader="$program"
aclocal="$program"
find_program autoheader 2.53
autoheader="$program"
-find_program automake 1.7
+find_program automake 1.9
automake="$program"
find_program autoconf 2.53
autoconf="$program"
automake="$program"
find_program autoconf 2.53
autoconf="$program"
AUTOMAKE_OPTIONS = foreign
AUTOMAKE_OPTIONS = foreign
-pkgdocdir = $(prefix)/doc/@PACKAGE@
+pkgdocdir = $(datadir)/doc/@PACKAGE@
docfiles = \
CREDITS.txt \
docfiles = \
CREDITS.txt \
%install
[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
%install
[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
%{__make} install DESTDIR=$RPM_BUILD_ROOT
%{__make} install DESTDIR=$RPM_BUILD_ROOT
-%{__mv} $RPM_BUILD_ROOT/usr/doc/%{name} _docs
%if "%{_vendor}" == "suse"
%{__sed} -i "s/\/var\/log\/httpd/\/var\/log\/apache2/g" \
%if "%{_vendor}" == "suse"
%{__sed} -i "s/\/var\/log\/httpd/\/var\/log\/apache2/g" \
%files -f rpm.filelist
%defattr(-,root,root,-)
%files -f rpm.filelist
%defattr(-,root,root,-)
-%doc _docs/CREDITS.txt _docs/LICENSE.txt _docs/NOTICE.txt _docs/README.txt _docs/RELEASE.txt
-%doc _docs/logo.jpg _docs/main.css
%{_sbindir}/shibd
%{_bindir}/mdquery
%{_bindir}/resolvertest
%{_sbindir}/shibd
%{_bindir}/mdquery
%{_bindir}/resolvertest
%{_sysconfdir}/%{name}/shibd-debian
%{_sysconfdir}/%{name}/shibd-osx.plist
%exclude %{_libexecdir}/*.la
%{_sysconfdir}/%{name}/shibd-debian
%{_sysconfdir}/%{name}/shibd-osx.plist
%exclude %{_libexecdir}/*.la
+%docdir %{_datadir}/doc/%{name}
+%{_datadir}/doc/%{name}
%files devel
%defattr(-,root,root,-)
%files devel
%defattr(-,root,root,-)