Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote-tracking branch 'boxuk/master'

Conflicts:
	Makefile.in

merged pull request
  • Loading branch information...
commit 17f75849d9d5d655129f45fc8f959bafb53c489c 2 parents 13220f5 + e29f89c
@0x616469 0x616469 authored
Showing with 3 additions and 2 deletions.
  1. +2 −2 Makefile.in
  2. +1 −0  packaging_config.php.sample
View
4 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) .
View
1  packaging_config.php.sample
@@ -1,5 +1,6 @@
$configure = array(
'packagename' => 'mypackage',
+ 'arch' => 'all',
'version' => '1.0',
'maintainer' => 'me myself <me@myself.com>',
'description' => '',
Please sign in to comment.
Something went wrong with that request. Please try again.