| @@ -1,29 +1,29 @@ | | | @@ -1,29 +1,29 @@ |
1 | $NetBSD: patch-aa,v 1.2 2010/05/09 18:20:38 pettai Exp $ | | 1 | $NetBSD: patch-aa,v 1.3 2012/05/23 10:05:44 pettai Exp $ |
2 | | | 2 | |
3 | --- Makefile.in.orig 2009-12-22 23:14:34.000000000 +0100 | | 3 | --- Makefile.in.orig 2012-05-09 18:41:49.000000000 +0000 |
4 | +++ Makefile.in 2009-12-22 23:16:23.000000000 +0100 | | 4 | +++ Makefile.in |
5 | @@ -256,6 +256,7 @@ | | 5 | @@ -271,6 +271,7 @@ sharedstatedir = @sharedstatedir@ |
6 | softhsmdbdir = @softhsmdbdir@ | | 6 | softhsmdbdir = @softhsmdbdir@ |
7 | srcdir = @srcdir@ | | 7 | srcdir = @srcdir@ |
8 | sysconfdir = @sysconfdir@ | | 8 | sysconfdir = @sysconfdir@ |
9 | +EGDIR = @EGDIR@ | | 9 | +EGDIR = @EGDIR@ |
10 | target_alias = @target_alias@ | | 10 | target_alias = @target_alias@ |
11 | top_build_prefix = @top_build_prefix@ | | 11 | top_build_prefix = @top_build_prefix@ |
12 | top_builddir = @top_builddir@ | | 12 | top_builddir = @top_builddir@ |
13 | @@ -757,11 +758,11 @@ | | 13 | @@ -869,11 +870,11 @@ uninstall-man: uninstall-man5 |
14 | | | 14 | |
15 | | | 15 | |
16 | install-data-hook: | | 16 | install-data-hook: |
17 | - test -d ${DESTDIR}${sysconfdir} || \ | | 17 | - test -d ${DESTDIR}${sysconfdir} || \ |
18 | - ${INSTALL} -d ${DESTDIR}${sysconfdir} | | 18 | - ${INSTALL} -d ${DESTDIR}${sysconfdir} |
19 | - test -f ${DESTDIR}${sysconfdir}/softhsm.conf || \ | | 19 | - test -f ${DESTDIR}${sysconfdir}/softhsm.conf || \ |
20 | - ${INSTALL_DATA} ${top_builddir}/softhsm.conf ${DESTDIR}${sysconfdir} | | 20 | - ${INSTALL_DATA} ${top_builddir}/softhsm.conf ${DESTDIR}${sysconfdir} |
21 | - ${INSTALL_DATA} ${top_builddir}/softhsm.conf ${DESTDIR}${sysconfdir}/softhsm.conf.sample | | 21 | - ${INSTALL_DATA} ${top_builddir}/softhsm.conf ${DESTDIR}${sysconfdir}/softhsm.conf.sample |
22 | + test -d ${DESTDIR}${EGDIR} || \ | | 22 | + test -d ${DESTDIR}${EGDIR} || \ |
23 | + ${INSTALL} -d ${DESTDIR}${EGDIR} | | 23 | + ${INSTALL} -d ${DESTDIR}${EGDIR} |
24 | + test -f ${DESTDIR}${EGDIR}/softhsm.conf || \ | | 24 | + test -f ${DESTDIR}${EGDIR}/softhsm.conf || \ |
25 | + ${INSTALL_DATA} ${top_builddir}/softhsm.conf ${DESTDIR}${EGDIR} | | 25 | + ${INSTALL_DATA} ${top_builddir}/softhsm.conf ${DESTDIR}${EGDIR} |
26 | + ${INSTALL_DATA} ${top_builddir}/softhsm.conf ${DESTDIR}${EGDIR}/softhsm.conf.sample | | 26 | + ${INSTALL_DATA} ${top_builddir}/softhsm.conf ${DESTDIR}${EGDIR}/softhsm.conf.sample |
27 | test -d ${DESTDIR}${softhsmdbdir} || \ | | 27 | test -d ${DESTDIR}${softhsmdbdir} || \ |
28 | ${INSTALL} -d -m 700 ${DESTDIR}${softhsmdbdir} | | 28 | ${INSTALL} -d -m 700 ${DESTDIR}${softhsmdbdir} |
29 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | | 29 | |