giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: fix parallel install by creating directory in the rule 

Relying on the rule that creates the directory is a bad idea to be
parallel safe.
This commit is contained in:
Diego Elio Pettenò 2012-05-13 14:55:35 -07:00 committed by Viktor Tarasov
parent 07d51bea36
commit 3c324b8b73
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/Makefile.am
View File

@ -18,8 +18,8 @@ opensc.conf: opensc.conf.in force
-e 's|@DEFAULT_PCSC_PROVIDER[@]|$(DEFAULT_PCSC_PROVIDER)|g' \
< $< > $@
sysconf_DATA=#required in order to create dir
install-exec-hook: install-sysconfDATA opensc.conf
install-exec-hook: opensc.conf
$(mkdir_p) "$(DESTDIR)$(sysconfdir)"
if [ -f "$(DESTDIR)$(sysconfdir)/opensc.conf" ]; then \
$(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf.new"; \
else \

7
src/pkcs11/Makefile.am
View File

@ -56,19 +56,20 @@ pkcs11-jar: jar-dir
-k"testcert" jar-dir
if WIN32
install-exec-hook: install-pkcs11DATA
install-exec-hook:
$(mkdir_p) "$(DESTDIR)$(libdir)"
for l in opensc-pkcs11.dll onepin-opensc-pkcs11.dll pkcs11-spy.dll; do \
mv "$(DESTDIR)$(libdir)/$$l" "$(DESTDIR)$(bindir)/$$l"; \
done
else
# see http://wiki.cacert.org/wiki/Pkcs11TaskForce
pkcs11_DATA = #This will create the directory
if CYGWIN
PKCS11_SUFFIX=.dll
else
PKCS11_SUFFIX=.so
endif
install-exec-hook: install-pkcs11DATA
install-exec-hook:
$(mkdir_p) "$(DESTDIR)$(pkcs11dir)"
for l in opensc-pkcs11$(PKCS11_SUFFIX) onepin-opensc-pkcs11$(PKCS11_SUFFIX) pkcs11-spy$(PKCS11_SUFFIX); do \
rm -f "$(DESTDIR)$(pkcs11dir)/$$l"; \
$(LN_S) ../$$l "$(DESTDIR)$(pkcs11dir)/$$l"; \