Merge remote-tracking branch 'boxuk/master'

Conflicts: Makefile.in merged pull request
liip · Sep 14, 2012 · 17f7584 · 17f7584
2 parents 13220f5 + e29f89c
commit 17f7584
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -7,7 +7,7 @@ MAINTAINER=@MAINTAINER@
 PACKAGENAME=@PACKAGENAME@
 PACKAGETYPE=@PACKAGETYPE@
 URL=@URL@
-ARCH=all
+ARCH=@ARCH@
 DEPENDS=@DEPENDS@
 MAINTAINER=@MAINTAINER@
 DESCRIPTION=@DESCRIPTION@
@@ -46,5 +46,5 @@ package: build
 		$(DEBCONFCONFIG) \
 		$(DEBCONFTEMPLATE) \
 		$(CONFIGFILE) \
-		-a $(ARCH) -C $(PTMP)/build -p $(PTMP)/$(PACKAGENAME)_$(VERSION).$(PACKAGETYPE) .
+		-a $(ARCH) -C $(PTMP)/build -p $(PTMP)/$(PACKAGENAME)_$(VERSION)_$(ARCH).$(PACKAGETYPE) .
 
diff --git a/packaging_config.php.sample b/packaging_config.php.sample
@@ -1,5 +1,6 @@
 $configure = array(
     'packagename' => 'mypackage',
+    'arch' => 'all',
     'version' => '1.0',
     'maintainer' => 'me myself <me@myself.com>',
     'description' => '',