From cdf900cf2c98b4e3fad11e8b69cd2135f2c306c7 Mon Sep 17 00:00:00 2001 From: Max Romanov Date: Fri, 1 Dec 2017 16:59:41 +0300 Subject: Packaging changes for updated Go package. - package name changed to 'nginx/unit'; - source files installed in /usr/share/gocode; - rpm and deb go packages made noarch. --- pkg/deb/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkg/deb/Makefile') diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index fb31ad2b..6fdb667d 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -144,7 +144,7 @@ debuild-%: debuild/unit_$(VERSION).orig.tar.gz ../../docs/changes.xml > $@/$(SRCDIR)/debian/changelog cp debian/copyright debuild-$*/$(SRCDIR)/debian/ @{ \ - set -e ; \ + set -e ; \ for src in $(MODULE_SOURCES_$*); do \ cp debian.module/$${src} $@/$(SRCDIR)/debian/ ; \ done ; \ @@ -152,7 +152,7 @@ debuild-%: debuild/unit_$(VERSION).orig.tar.gz ../../docs/changes.xml 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/control.in | sed \ + cat debian.module/$(if $(MODULE_NOARCH_$*),control-noarch.in,control.in) | sed \ -e "s#%%NAME%%#unit-$(MODULE_SUFFIX_$*)#g" \ -e "s#%%SUMMARY%%#$(MODULE_SUMMARY_$*)#g" \ -e "s#%%CODENAME%%#$(CODENAME)#g" \ @@ -163,7 +163,7 @@ debuild-%: debuild/unit_$(VERSION).orig.tar.gz ../../docs/changes.xml -e "s#%%MODULE_BUILD_DEPENDS%%#$(MODULE_BUILD_DEPENDS_$*)#g" \ -e "s#%%MODULE_DEPENDS%%#$(MODULE_DEPENDS_$*)#g" \ > $@/$(SRCDIR)/debian/control ; \ - cat debian.module/rules.in | sed \ + cat debian.module/$(if $(MODULE_NOARCH_$*),rules-noarch.in,rules.in) | sed \ -e "s#%%NAME%%#unit-$(MODULE_SUFFIX_$*)#g" \ -e "s#%%CODENAME%%#$(CODENAME)#g" \ -e "s#%%UNIT_VERSION%%#$(VERSION)#g" \ -- cgit