diff options
author | Andrei Belov <defan@nginx.com> | 2018-12-20 20:25:50 +0300 |
---|---|---|
committer | Andrei Belov <defan@nginx.com> | 2018-12-20 20:25:50 +0300 |
commit | 82e12d0cdeeb707ad4b1aef91c5e90b4347b0831 (patch) | |
tree | 19ef4cf3dea340fa365af022c76543f92d1e2e0a /pkg/deb/Makefile | |
parent | b140ac29e5571e9abaafce006932f15d86b78803 (diff) | |
parent | 4195a29fabfe65f5a28baf2405c2077e2ba3c09a (diff) | |
download | unit-82e12d0cdeeb707ad4b1aef91c5e90b4347b0831.tar.gz unit-82e12d0cdeeb707ad4b1aef91c5e90b4347b0831.tar.bz2 |
Merged with the default branch.
Diffstat (limited to 'pkg/deb/Makefile')
-rw-r--r-- | pkg/deb/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index 735f283b..2dcf6f50 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -199,7 +199,7 @@ endif prebuild=`echo "$$MODULE_PREBUILD_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \ preinstall=`echo "$$MODULE_PREINSTALL_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \ post=`echo "$$MODULE_POST_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \ - cat debian.module/$(if $(MODULE_NOARCH_$*),control-noarch.in,control.in) | sed \ + cat debian.module/control.in | sed \ -e "s#%%NAME%%#unit-$(MODULE_SUFFIX_$*)#g" \ -e "s#%%SUMMARY%%#$(MODULE_SUMMARY_$*)#g" \ -e "s#%%CODENAME%%#$(CODENAME)#g" \ @@ -210,7 +210,7 @@ endif -e "s#%%MODULE_BUILD_DEPENDS%%#$(MODULE_BUILD_DEPENDS_$*)#g" \ -e "s#%%MODULE_DEPENDS%%#$(MODULE_DEPENDS_$*)#g" \ > $@/$(SRCDIR)/debian/control ; \ - cat debian.module/$(if $(MODULE_NOARCH_$*),rules-noarch.in,rules.in) | sed \ + cat debian.module/rules.in | sed \ -e "s#%%NAME%%#unit-$(MODULE_SUFFIX_$*)#g" \ -e "s#%%CODENAME%%#$(CODENAME)#g" \ -e "s#%%UNIT_VERSION%%#$(VERSION)#g" \ |