From 87db3c96c2578a9c595701cb9c63e89957195d97 Mon Sep 17 00:00:00 2001 From: alonbl Date: Tue, 1 Apr 2008 19:04:33 +0000 Subject: [PATCH] More separate srcdir fixups git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3450 c6295689-39f2-0310-b995-f0e70906c6a9 --- Makefile.am | 12 +++++++----- aclocal/Makefile.am | 2 +- configure.ac | 2 +- doc/Makefile.am | 5 +++-- doc/nonpersistent/Makefile.am | 10 ++++++---- etc/Makefile.am | 8 ++++---- src/Makefile.am | 2 +- src/common/Makefile.am | 2 +- src/include/Makefile.am | 2 +- src/include/opensc/Makefile.am | 2 +- src/libopensc/Makefile.am | 2 +- src/openssh/Makefile.am | 2 +- src/pkcs11/Makefile.am | 2 +- src/pkcs15init/Makefile.am | 2 +- src/scconf/Makefile.am | 2 +- src/signer/Makefile.am | 2 +- src/signer/npinclude/Makefile.am | 2 +- src/tests/Makefile.am | 2 +- src/tests/regression/Makefile.am | 4 ++-- src/tools/Makefile.am | 2 +- win32/Makefile.am | 2 +- 21 files changed, 38 insertions(+), 33 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8420bcc1..3589d370 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,11 +2,13 @@ AUTOMAKE_OPTIONS = foreign 1.10 ACLOCAL_AMFLAGS = -I aclocal MAINTAINERCLEANFILES = \ - Makefile.in config.h.in config.h.in~ configure \ - install-sh ltmain.sh missing mkinstalldirs \ - compile depcomp config.log config.status \ - config.guess config.sub acinclude.m4 aclocal.m4 \ - packaged + config.log config.status \ + $(srcdir)/Makefile.in \ + $(srcdir)/config.h.in $(srcdir)/config.h.in~ $(srcdir)/configure \ + $(srcdir)/install-sh $(srcdir)/ltmain.sh $(srcdir)/missing \ + $(srcdir)/depcomp $(srcdir)/aclocal.m4 \ + $(srcdir)/config.guess $(srcdir)/config.sub \ + $(srcdir)/packaged EXTRA_DIST = Makefile.mak svnignore SUBDIRS = aclocal etc src win32 doc diff --git a/aclocal/Makefile.am b/aclocal/Makefile.am index cc705a94..c65d62a1 100644 --- a/aclocal/Makefile.am +++ b/aclocal/Makefile.am @@ -1,2 +1,2 @@ -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in EXTRA_DIST = acx_pthread.m4 libassuan.m4 diff --git a/configure.ac b/configure.ac index f8027aab..de358410 100644 --- a/configure.ac +++ b/configure.ac @@ -33,7 +33,7 @@ PKG_PROG_PKG_CONFIG AC_C_BIGENDIAN AC_MSG_CHECKING([svn checkout]) -if test -e packaged; then +if test -e "${srcdir}/packaged"; then svn_checkout="no" else svn_checkout="yes" diff --git a/doc/Makefile.am b/doc/Makefile.am index 056dbb82..4ffa7bb5 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in wikidir=$(htmldir)/wiki @@ -79,4 +79,5 @@ endif endif maintainer-clean-local: - rm -rf html.out html.tmp man.out man.tmp api.work + rm -rf "$(srcdir)/html.out" "$(srcdir)/man.out" \ + html.out html.tmp man.out man.tmp api.work diff --git a/doc/nonpersistent/Makefile.am b/doc/nonpersistent/Makefile.am index 36b175c2..b7668872 100644 --- a/doc/nonpersistent/Makefile.am +++ b/doc/nonpersistent/Makefile.am @@ -1,4 +1,6 @@ -MAINTAINERCLEANFILES = Makefile.in ChangeLog ChangeLog.tmp +MAINTAINERCLEANFILES = \ + $(srcdir)/Makefile.in $(srcdir)/ChangeLog \ + ChangeLog ChangeLog.tmp wikidir=$(htmldir)/wiki @@ -13,8 +15,8 @@ wiki.out/*: test -n "$(WGET)" -a -n "$(SED)" -a -n "$(TR)" -a -n "$(XSLTPROC)" WGET="$(WGET)" WGET_OPTS="$(WGET_OPTS)" SED="$(SED)" TR="$(TR)" XSLTPROC="$(XSLTPROC)" \ PROJECT="@PACKAGE_NAME@" \ - $(SHELL) "$(srcdir)/export-wiki.sh" "$(srcdir)" "$(builddir)/wiki.tmp" - mv "$(srcdir)/wiki.tmp" wiki.out + $(SHELL) "$(srcdir)/export-wiki.sh" "$(srcdir)" "wiki.tmp" + mv wiki.tmp wiki.out ChangeLog: test -n "$(SVN)" -a -n "$(XSLTPROC)" @@ -33,4 +35,4 @@ ChangeLog: endif maintainer-clean-local: - rm -rf wiki.out wiki.tmp + rm -rf $(srcdir)/wiki.out wiki.out wiki.tmp diff --git a/etc/Makefile.am b/etc/Makefile.am index cee25510..c69f641c 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -1,4 +1,4 @@ -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in DISTCLEANFILES = opensc.conf SUFFIXES = .in @@ -11,8 +11,8 @@ nodist_noinst_DATA = opensc.conf sysconf_DATA=#required in order to create dir install-exec-hook: install-sysconfDATA opensc.conf - if [ -f $(DESTDIR)$(sysconfdir)/opensc.conf ]; then \ - $(INSTALL_DATA) opensc.conf $(DESTDIR)$(sysconfdir)/opensc.conf.new; \ + if [ -f "$(DESTDIR)$(sysconfdir)/opensc.conf" ]; then \ + $(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf.new"; \ else \ - $(INSTALL_DATA) opensc.conf $(DESTDIR)$(sysconfdir)/opensc.conf; \ + $(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf"; \ fi diff --git a/src/Makefile.am b/src/Makefile.am index e9b2c720..b6407606 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in EXTRA_DIST = Makefile.mak # Order IS important diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 1136754b..3e9b19aa 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -1,4 +1,4 @@ -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in EXTRA_DIST = Makefile.mak noinst_LTLIBRARIES = libcompat.la diff --git a/src/include/Makefile.am b/src/include/Makefile.am index 4304fbb3..1190f5a8 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -1,4 +1,4 @@ -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in EXTRA_DIST = Makefile.mak winconfig.h SUBDIRS = opensc diff --git a/src/include/opensc/Makefile.am b/src/include/opensc/Makefile.am index 3f0f9d72..a963b063 100644 --- a/src/include/opensc/Makefile.am +++ b/src/include/opensc/Makefile.am @@ -1,4 +1,4 @@ -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in EXTRA_DIST = svnignore all-local: diff --git a/src/libopensc/Makefile.am b/src/libopensc/Makefile.am index 96ee4565..d2c0597d 100644 --- a/src/libopensc/Makefile.am +++ b/src/libopensc/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/win32/ltrc.inc -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in CLEANFILES = versioninfo.rc EXTRA_DIST = Makefile.mak diff --git a/src/openssh/Makefile.am b/src/openssh/Makefile.am index e1d8bf6d..b136c163 100644 --- a/src/openssh/Makefile.am +++ b/src/openssh/Makefile.am @@ -1,3 +1,3 @@ -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in dist_noinst_DATA = README ask-for-pin.diff diff --git a/src/pkcs11/Makefile.am b/src/pkcs11/Makefile.am index 2c07f6ed..e9fac700 100644 --- a/src/pkcs11/Makefile.am +++ b/src/pkcs11/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/win32/ltrc.inc -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in CLEANFILES = versioninfo.rc EXTRA_DIST = Makefile.mak diff --git a/src/pkcs15init/Makefile.am b/src/pkcs15init/Makefile.am index 365a366f..b5cff134 100644 --- a/src/pkcs15init/Makefile.am +++ b/src/pkcs15init/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/win32/ltrc.inc -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in CLEANFILES = versioninfo.rc EXTRA_DIST = Makefile.mak diff --git a/src/scconf/Makefile.am b/src/scconf/Makefile.am index f54b22c5..2397e951 100644 --- a/src/scconf/Makefile.am +++ b/src/scconf/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/win32/ltrc.inc -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in DISTCLEANFILES = lex-parse.c CLEANFILES = versioninfo.rc EXTRA_DIST = Makefile.mak diff --git a/src/signer/Makefile.am b/src/signer/Makefile.am index 341f551f..1aa6040f 100644 --- a/src/signer/Makefile.am +++ b/src/signer/Makefile.am @@ -1,4 +1,4 @@ -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in SUBDIRS = npinclude if ENABLE_NSPLUGIN diff --git a/src/signer/npinclude/Makefile.am b/src/signer/npinclude/Makefile.am index 7061e095..5e8fcf7e 100644 --- a/src/signer/npinclude/Makefile.am +++ b/src/signer/npinclude/Makefile.am @@ -1,3 +1,3 @@ -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in noinst_HEADERS = jri.h jri_md.h jritypes.h npapi.h npunix.c npupp.h diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 8e6b213d..2cea0ef6 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -1,4 +1,4 @@ -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in EXTRA_DIST = Makefile.mak SUBDIRS = regression diff --git a/src/tests/regression/Makefile.am b/src/tests/regression/Makefile.am index 829dacf3..93507d18 100644 --- a/src/tests/regression/Makefile.am +++ b/src/tests/regression/Makefile.am @@ -1,4 +1,4 @@ -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in dist_noinst_DATA = \ crypt0001 crypt0002 crypt0003 crypt0004 crypt0005 crypt0006 crypt0007 \ @@ -9,5 +9,5 @@ dist_noinst_DATA = \ dist_noinst_SCRIPTS = erase functions run-all # remove log files from regression tests -maintainer-clean-local: +clean-local: -rm -rf out failed diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index 73071679..28b6bab0 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/win32/ltrc.inc -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in CLEANFILES = versioninfo.rc EXTRA_DIST = Makefile.mak diff --git a/win32/Makefile.am b/win32/Makefile.am index 3ab27bc3..6fc6dbde 100644 --- a/win32/Makefile.am +++ b/win32/Makefile.am @@ -1,4 +1,4 @@ -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in EXTRA_DIST = Make.rules.mak Makefile.mak dist_noinst_SCRIPTS = makedef.pl