Skip to content

Fix variable names with modname in module Makefile #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions build_module.sh
Original file line number Diff line number Diff line change
Expand Up @@ -424,24 +424,25 @@ placeholder for nginx-module-$MODULE_NAME license / copyrights
__EOF__

echo "$ME: INFO: Creating module Makefile"
MODNAME_MAKEFILE=`echo $MODULE_NAME | tr '-' '_'`
cat << __EOF__ > Makefile.module-$MODULE_NAME
MODULES=$MODULE_NAME

MODULE_PACKAGE_VENDOR= Build Script <[email protected]>
MODULE_PACKAGE_URL= https://www.nginx.com/blog/compiling-dynamic-modules-nginx-plus/

MODULE_SUMMARY_$MODULE_NAME= $MODULE_NAME dynamic module
MODULE_VERSION_$MODULE_NAME= $MODULE_VERSION
MODULE_RELEASE_$MODULE_NAME= $MODULE_RELEASE
MODULE_VERSION_PREFIX_$MODULE_NAME= \$(MODULE_TARGET_PREFIX)
MODULE_CONFARGS_$MODULE_NAME= --add-dynamic-module=\$(MODSRC_PREFIX)$MODULE_NAME-$VERSION
MODULE_SOURCES_$MODULE_NAME= $MODULE_NAME-$VERSION.tar.gz
MODULE_SUMMARY_$MODNAME_MAKEFILE= $MODULE_NAME dynamic module
MODULE_VERSION_$MODNAME_MAKEFILE= $MODULE_VERSION
MODULE_RELEASE_$MODNAME_MAKEFILE= $MODULE_RELEASE
MODULE_VERSION_PREFIX_$MODNAME_MAKEFILE= \$(MODULE_TARGET_PREFIX)
MODULE_CONFARGS_$MODNAME_MAKEFILE= --add-dynamic-module=\$(MODSRC_PREFIX)$MODULE_NAME-$VERSION
MODULE_SOURCES_$MODNAME_MAKEFILE= $MODULE_NAME-$VERSION.tar.gz

define MODULE_POST_$MODULE_NAME
define MODULE_POST_$MODNAME_MAKEFILE
cat <<BANNER
----------------------------------------------------------------------

The \$(MODULE_SUMMARY_$MODULE_NAME) for nginx has been installed.
The \$(MODULE_SUMMARY_$MODNAME_MAKEFILE) for nginx has been installed.
To enable this module, add the following to /etc/nginx/nginx.conf
and reload nginx:

Expand All @@ -450,7 +451,7 @@ and reload nginx:
----------------------------------------------------------------------
BANNER
endef
export MODULE_POST_$MODULE_NAME
export MODULE_POST_$MODNAME_MAKEFILE
__EOF__

cp Makefile.module-$MODULE_NAME $BUILD_DIR/pkg-oss/rpm/SPECS/
Expand Down