From c9b19135fca4610e75a15cc5241115204b81968b Mon Sep 17 00:00:00 2001
From: alonbl <alonbl@c6295689-39f2-0310-b995-f0e70906c6a9>
Date: Tue, 1 Apr 2008 19:58:30 +0000
Subject: [PATCH] More separate srcdir fixups, make distcheck work

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3451 c6295689-39f2-0310-b995-f0e70906c6a9
---
 Makefile.am                   |  6 +++---
 doc/Makefile.am               | 11 +++++++++++
 doc/nonpersistent/Makefile.am |  8 ++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 3589d370..9e42f3c3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,9 +24,9 @@ dist-hook:
 	echo > "$(distdir)/packaged"
 
 distcheck-hook:
-	@eval $$(sed -e '/^PACKAGE_VERSION=/!d' -e 's,^,configure_,' configure); \
-	eval $$(sed -e '/^ \(FILE\|PRODUCT\)VERSION /!d' -e 's,^ ,version_rc_,' -e 's, ,=,' -e 's/,/./g' win32/version.rc); \
-	eval $$(sed -e '/^#define VERSION /!d' -e 's,^#define ,winconfig_h_,' -e 's, ,=,' src/include/winconfig.h); \
+	@eval $$(sed -e '/^PACKAGE_VERSION=/!d' -e 's,^,configure_,' "$(srcdir)/configure"); \
+	eval $$(sed -e '/^ \(FILE\|PRODUCT\)VERSION /!d' -e 's,^ ,version_rc_,' -e 's, ,=,' -e 's/,/./g' "$(srcdir)/win32/version.rc"); \
+	eval $$(sed -e '/^#define VERSION /!d' -e 's,^#define ,winconfig_h_,' -e 's, ,=,' "$(srcdir)/src/include/winconfig.h"); \
 	err=$$( \
 		test "$${configure_PACKAGE_VERSION}.0" = "$${version_rc_FILEVERSION}" || echo "configure PACKAGE_VERSION $${configure_PACKAGE_VERSION} != win32/version.rc FILEVERSION $${version_rc_FILEVERSION}"; \
 		test "$${configure_PACKAGE_VERSION}.0" = "$${version_rc_PRODUCTVERSION}" || echo "configure PACKAGE_VERSION $${configure_PACKAGE_VERSION} != win32/version.rc PRODUCTVERSION $${version_rc_PRODUCTVERSION}"; \
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4ffa7bb5..0f5b64da 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -76,6 +76,17 @@ man.out/*.1:
 man.out/*.3 man.out/*.5:	man.out/*.1
 
 endif
+else
+
+
+html.out/*:
+	$(LN_S) "$(srcdir)/html.out" html.out
+
+man.out/*.1:
+	$(LN_S) "$(srcdir)/man.out" man.out
+
+man.out/*.3 man.out/*.5:	man.out/*.1
+
 endif
 
 maintainer-clean-local:
diff --git a/doc/nonpersistent/Makefile.am b/doc/nonpersistent/Makefile.am
index b7668872..5b631cf3 100644
--- a/doc/nonpersistent/Makefile.am
+++ b/doc/nonpersistent/Makefile.am
@@ -32,6 +32,14 @@ ChangeLog:
 	fi
 	mv ChangeLog.tmp ChangeLog
 
+else
+
+wiki.out/*:
+	$(LN_S) "$(srcdir)/wiki.out" wiki.out
+
+ChangeLog:
+	$(LN_S) "$(srcdir)/ChangeLog" ChangeLog
+
 endif
 
 maintainer-clean-local: