use new config properties for sample lxc config

[aab.git] / Makefile

diff --git a/Makefile b/Makefile
index 955489261e7a07fa6a3cfd9f32b20baa883a563c..b61323e63bab7c0af36c18d46db824f8a9c5fe21 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,22 @@
-TODAY != date '+%Y%M%d'
+TODAY != date '+%Y%m%d'
 
 VERSION := $(TODAY)-1
-V_x86_64 := $(VERSION)_x86_64
+V_amd64  := $(VERSION)_amd64
 V_i686   := $(VERSION)_i686
 
+PERL := perl -I.
+
 all:
        @echo The following targets are available:
-       @echo '  $(MAKE) base-x86_64'
+       @echo '  $(MAKE) base-amd64'
        @echo '  $(MAKE) base-i686'
-       @echo '  $(MAKE) default           (same as make base-x86_64)'
+       @echo '  $(MAKE) default           (same as make base-amd64)'
 
 .PHONY: default
-default: base-x86_64
+default: base-amd64
 
 # we should always regenerate this:
-.PHONY: aab.conf aab.conf.x86_64 aab.conf.i686
+.PHONY: aab.conf aab.conf.amd64 aab.conf.i686
 aab.conf:
        echo 'Name: archlinux-base' > aab.conf
        echo 'Version: $(VERSION)' >> aab.conf
@@ -22,14 +24,14 @@ aab.conf:
        echo 'Maintainer: Proxmox Support Team <support@proxmox.com>' >> aab.conf
        echo 'Source: http://archlinux.cu.be/$$repo/os/$$arch' >> aab.conf
 
-aab.conf.x86_64: aab.conf
-       echo 'Architecture: x86_64' >> aab.conf
+aab.conf.amd64: aab.conf
+       echo 'Architecture: amd64' >> aab.conf
 aab.conf.i686: aab.conf
        echo 'Architecture: i686' >> aab.conf
 
-.PHONY: base-x86_64
-base-x86_64: archlinux-base_$(V_x86_64).tar.gz
-archlinux-base_$(V_x86_64).tar.gz: aab.conf.x86_64
+.PHONY: base-amd64
+base-amd64: archlinux-base_$(V_amd64).tar.gz
+archlinux-base_$(V_amd64).tar.gz: aab.conf.amd64
        echo 'Headline: ArchLinux base image.' >> aab.conf
        $(MAKE) build-current
 
@@ -41,10 +43,10 @@ archlinux-base_$(V_i686).tar.gz: aab.conf.i686
 
 .PHONY: build-current
 build-current: check-all
-       ./aab init
-       ./aab bootstrap
-       ./aab finalize
-       ./aab clean
+       $(PERL) ./aab init
+       $(PERL) ./aab bootstrap
+       $(PERL) ./aab finalize
+       $(PERL) ./aab clean
 
 .PHONY: check-pacman
 check-pacman:
@@ -59,8 +61,8 @@ check-all: check-pacman check-root
 
 .PHONY: clean
 clean:
-       @./aab clean
+       @$(PERL) ./aab clean
 
 .PHONY: distclean
 distclean:
-       @./aab dist-clean
+       @$(PERL) ./aab dist-clean