Packages: made unit-go architecture-dependent.

This closes #172 issue on GitHub.

6 files changed, 2 insertions, 12 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" \
diff --git a/pkg/deb/Makefile.go b/pkg/deb/Makefile.go
index 2d7d6537..bbade7a3 100644
--- a/pkg/deb/Makefile.go
+++ b/pkg/deb/Makefile.go
@@ -19,8 +19,6 @@ BUILD_DEPENDS+=		$(BUILD_DEPENDS_go)
 MODULE_BUILD_DEPENDS_go=,golang
 MODULE_DEPENDS_go=,golang
 
-MODULE_NOARCH_go=	true
-
 define MODULE_PREINSTALL_go
 	mkdir -p debian/unit-go/usr/share/doc/unit-go/examples/go-app
 	install -m 644 -p debian/unit.example-go-app debian/unit-go/usr/share/doc/unit-go/examples/go-app/let-my-people.go
diff --git a/pkg/deb/Makefile.go110 b/pkg/deb/Makefile.go110
index 863f7c90..9fb3da9d 100644
--- a/pkg/deb/Makefile.go110
+++ b/pkg/deb/Makefile.go110
@@ -19,8 +19,6 @@ BUILD_DEPENDS+=		$(BUILD_DEPENDS_go110)
 MODULE_BUILD_DEPENDS_go110=,golang-1.10
 MODULE_DEPENDS_go110=,golang-1.10
 
-MODULE_NOARCH_go110=	true
-
 define MODULE_PREINSTALL_go110
 	mkdir -p debian/unit-go1.10/usr/share/doc/unit-go1.10/examples/go-app
 	install -m 644 -p debian/unit.example-go-app debian/unit-go1.10/usr/share/doc/unit-go1.10/examples/go-app/let-my-people.go
diff --git a/pkg/deb/Makefile.go17 b/pkg/deb/Makefile.go17
index 201b32b2..4c3cc73f 100644
--- a/pkg/deb/Makefile.go17
+++ b/pkg/deb/Makefile.go17
@@ -19,8 +19,6 @@ BUILD_DEPENDS+=		$(BUILD_DEPENDS_go17)
 MODULE_BUILD_DEPENDS_go17=,golang-1.7
 MODULE_DEPENDS_go17=,golang-1.7
 
-MODULE_NOARCH_go17=	true
-
 define MODULE_PREINSTALL_go17
 	mkdir -p debian/unit-go1.7/usr/share/doc/unit-go1.7/examples/go-app
 	install -m 644 -p debian/unit.example-go-app debian/unit-go1.7/usr/share/doc/unit-go1.7/examples/go-app/let-my-people.go
diff --git a/pkg/deb/Makefile.go18 b/pkg/deb/Makefile.go18
index 70b155d4..a9db87e0 100644
--- a/pkg/deb/Makefile.go18
+++ b/pkg/deb/Makefile.go18
@@ -19,8 +19,6 @@ BUILD_DEPENDS+=		$(BUILD_DEPENDS_go18)
 MODULE_BUILD_DEPENDS_go18=,golang-1.8
 MODULE_DEPENDS_go18=,golang-1.8
 
-MODULE_NOARCH_go18=	true
-
 define MODULE_PREINSTALL_go18
 	mkdir -p debian/unit-go1.8/usr/share/doc/unit-go1.8/examples/go-app
 	install -m 644 -p debian/unit.example-go-app debian/unit-go1.8/usr/share/doc/unit-go1.8/examples/go-app/let-my-people.go
diff --git a/pkg/deb/Makefile.go19 b/pkg/deb/Makefile.go19
index 9ddcc493..43611560 100644
--- a/pkg/deb/Makefile.go19
+++ b/pkg/deb/Makefile.go19
@@ -19,8 +19,6 @@ BUILD_DEPENDS+=		$(BUILD_DEPENDS_go19)
 MODULE_BUILD_DEPENDS_go19=,golang-1.9
 MODULE_DEPENDS_go19=,golang-1.9
 
-MODULE_NOARCH_go19=	true
-
 define MODULE_PREINSTALL_go19
 	mkdir -p debian/unit-go1.9/usr/share/doc/unit-go1.9/examples/go-app
 	install -m 644 -p debian/unit.example-go-app debian/unit-go1.9/usr/share/doc/unit-go1.9/examples/go-app/let-my-people.go