[pkg-opensc-commit] [pkcs11-helper] 16/53: Finish distro directory
Eric Dorland
eric at moszumanska.debian.org
Fri Jan 6 23:39:51 UTC 2017
This is an automated email from the git hooks/post-receive script.
eric pushed a commit to tag pkcs11-helper-1.03
in repository pkcs11-helper.
commit 6324f7da2fb892961cb38532e1181d5bf373c19c
Author: alonbl <alonbl at 485eb718-1723-0410-b8a9-88cf21a28c35>
Date: Tue Feb 13 09:46:24 2007 +0000
Finish distro directory
---
Makefile.am | 4 ++--
configure.ac | 5 ++++-
Makefile.am => distro/Makefile.am | 11 +---------
Makefile.am => distro/debian/Makefile.am | 24 +++++++++++++---------
Makefile.am => distro/rpm/Makefile.am | 11 +---------
.../rpm/pkcs11-helper.spec.in | 0
6 files changed, 22 insertions(+), 33 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 78b206c..afb75a5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,9 +53,9 @@
# INSTALL targets:
AUTOMAKE_OPTIONS=foreign dist-bzip2
-SUBDIRS=man include lib m4dir doc tests
+SUBDIRS=man include lib m4dir doc distro tests
dist_mydoc_DATA=README COPYING.GPL COPYING.BSD COPYING
-EXTRA_DIST=config-w32-vc.h pkcs11-helper.spec
+EXTRA_DIST=config-w32-vc.h
diff --git a/configure.ac b/configure.ac
index d3a5d10..e28ca0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -379,7 +379,6 @@ AM_CONDITIONAL([ENABLE_PKCS11H_OPENSSL], [test "${enable_openssl}" = "yes"])
AC_CONFIG_FILES([
Makefile
config-w32-vc.h
- pkcs11-helper.spec
include/Makefile
include/pkcs11-helper-1.0/Makefile
include/pkcs11-helper-1.0/pkcs11h-version.h
@@ -389,6 +388,10 @@ AC_CONFIG_FILES([
lib/Makefile
lib/libpkcs11-helper-1.pc
m4dir/Makefile
+ distro/Makefile
+ distro/rpm/Makefile
+ distro/rpm/pkcs11-helper.spec
+ distro/debian/Makefile
tests/Makefile
tests/test-basic/Makefile
tests/test-certificate/Makefile
diff --git a/Makefile.am b/distro/Makefile.am
similarity index 90%
copy from Makefile.am
copy to distro/Makefile.am
index 78b206c..50b6b03 100644
--- a/Makefile.am
+++ b/distro/Makefile.am
@@ -49,13 +49,4 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-# This option prevents autoreconf from overriding our COPYING and
-# INSTALL targets:
-AUTOMAKE_OPTIONS=foreign dist-bzip2
-
-SUBDIRS=man include lib m4dir doc tests
-
-dist_mydoc_DATA=README COPYING.GPL COPYING.BSD COPYING
-
-EXTRA_DIST=config-w32-vc.h pkcs11-helper.spec
-
+SUBDIRS=rpm debian
diff --git a/Makefile.am b/distro/debian/Makefile.am
similarity index 90%
copy from Makefile.am
copy to distro/debian/Makefile.am
index 78b206c..4695276 100644
--- a/Makefile.am
+++ b/distro/debian/Makefile.am
@@ -49,13 +49,17 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-# This option prevents autoreconf from overriding our COPYING and
-# INSTALL targets:
-AUTOMAKE_OPTIONS=foreign dist-bzip2
-
-SUBDIRS=man include lib m4dir doc tests
-
-dist_mydoc_DATA=README COPYING.GPL COPYING.BSD COPYING
-
-EXTRA_DIST=config-w32-vc.h pkcs11-helper.spec
-
+EXTRA_DIST= \
+ changelog \
+ README.Debian \
+ compat \
+ control \
+ copyright \
+ rules \
+ watch \
+ pkcs11-helper-dev.dirs \
+ pkcs11-helper-dev.docs \
+ pkcs11-helper-dev.install \
+ pkcs11-helper.dirs \
+ pkcs11-helper.install \
+ pkcs11-helper.manpages
diff --git a/Makefile.am b/distro/rpm/Makefile.am
similarity index 90%
copy from Makefile.am
copy to distro/rpm/Makefile.am
index 78b206c..0afb8d3 100644
--- a/Makefile.am
+++ b/distro/rpm/Makefile.am
@@ -49,13 +49,4 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-# This option prevents autoreconf from overriding our COPYING and
-# INSTALL targets:
-AUTOMAKE_OPTIONS=foreign dist-bzip2
-
-SUBDIRS=man include lib m4dir doc tests
-
-dist_mydoc_DATA=README COPYING.GPL COPYING.BSD COPYING
-
-EXTRA_DIST=config-w32-vc.h pkcs11-helper.spec
-
+EXTRA_DIST=pkcs11-helper.spec
diff --git a/pkcs11-helper.spec.in b/distro/rpm/pkcs11-helper.spec.in
similarity index 100%
rename from pkcs11-helper.spec.in
rename to distro/rpm/pkcs11-helper.spec.in
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/pkcs11-helper.git
More information about the pkg-opensc-commit
mailing list