ObjFW/ObjOpenSSL
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Adjust to new objfw-config package format

Browse source
This commit is contained in:
Jonathan Schleifer 2019-01-20 13:20:52 +01:00
parent f4de27ae12
commit 4d108bb9af
No known key found for this signature in database
GPG key ID: 79D21189A2D4708D
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Makefile
View file

@ -4,20 +4,23 @@ include buildsys.mk
include extra.mk include extra.mk
install-extra: install-extra:
i=packages/ObjOpenSSL; \ i=ObjOpenSSL.oc; \
packagesdir="${DESTDIR}$$(${OBJFW_CONFIG} --packages-dir)"; \
${INSTALL_STATUS}; \ ${INSTALL_STATUS}; \
if ${INSTALL} -m 644 $$i ${DESTDIR}$$(${OBJFW_CONFIG} --packages-dir)/ObjOpenSSL; then \ if ${MKDIR_P} $$packagesdir && ${INSTALL} -m 644 $$i $$packagesdir/$$i; then \
${INSTALL_OK}; \ ${INSTALL_OK}; \
else \ else \
${INSTALL_FAILED}; \ ${INSTALL_FAILED}; \
fi fi
uninstall-extra: uninstall-extra:
i=packages/ObjOpenSSL; \ i=ObjOpenSSL.oc; \
if test -f ${DESTDIR}$$(${OBJFW_CONFIG} --packages-dir)/ObjOpenSSL; then \ packagesdir="${DESTDIR}$$(${OBJFW_CONFIG} --packages-dir)"; \
if rm -f ${DESTDIR}$$(${OBJFW_CONFIG} --packages-dir)/ObjOpenSSL; then \ if test -f $$packagesdir/$$i; then \
if rm -f $$packagesdir/$$i; then \
${DELETE_OK}; \ ${DELETE_OK}; \
else \ else \
${DELETE_FAILED}; \ ${DELETE_FAILED}; \
fi \ fi \
fi fi; \
rmdir $$packagesdir >/dev/null 2>&1 || true

2
packages/ObjOpenSSL.in → ObjOpenSSL.oc.in
View file

@ -1,3 +1,3 @@
package_version 1 package_description 1
CPPFLAGS="$CPPFLAGS @OPENSSL_CPPFLAGS@" CPPFLAGS="$CPPFLAGS @OPENSSL_CPPFLAGS@"
LIBS="@OPENSSL_LIBS@ $LIBS" LIBS="@OPENSSL_LIBS@ $LIBS"

2
configure.ac
View file

@ -74,5 +74,5 @@ AC_SUBST(CPPFLAGS)
AC_SUBST(OPENSSL_CPPFLAGS) AC_SUBST(OPENSSL_CPPFLAGS)
AC_SUBST(OPENSSL_LIBS) AC_SUBST(OPENSSL_LIBS)
AC_CONFIG_FILES([buildsys.mk extra.mk packages/ObjOpenSSL]) AC_CONFIG_FILES([buildsys.mk extra.mk ObjOpenSSL.oc])
AC_OUTPUT AC_OUTPUT