X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=7712f6d2d26cc9a24f2592cfe3423e64f97c0720;hb=e374e7a7e1cb448b7a28733c9e186997959b6019;hp=955489261e7a07fa6a3cfd9f32b20baa883a563c;hpb=19401a1ef57d15cbbc04480232ca7966ae700cfb;p=aab.git

diff --git a/Makefile b/Makefile
index 9554892..7712f6d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,50 +1,36 @@
-TODAY != date '+%Y%M%d'
+TODAY != date '+%Y%m%d'
 
 VERSION := $(TODAY)-1
-V_x86_64 := $(VERSION)_x86_64
-V_i686   := $(VERSION)_i686
+ARCH := amd64
+V_ARCH := $(VERSION)_$(ARCH)
 
-all:
-	@echo The following targets are available:
-	@echo '  $(MAKE) base-x86_64'
-	@echo '  $(MAKE) base-i686'
-	@echo '  $(MAKE) default           (same as make base-x86_64)'
+PERL := perl -I.
 
 .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:
 	echo 'Name: archlinux-base' > aab.conf
 	echo 'Version: $(VERSION)' >> aab.conf
 	echo 'Section: system' >> 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.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
+	echo 'Architecture: $(ARCH)' >> aab.conf
 	echo 'Headline: ArchLinux base image.' >> aab.conf
-	$(MAKE) build-current
 
-.PHONY: base-xi686
-base-i686: archlinux-base_$(V_i686).tar.gz
-archlinux-base_$(V_i686).tar.gz: aab.conf.i686
-	echo 'Headline: ArchLinux base image.' >> aab.conf
-	$(MAKE) build-current
+.PHONY: base-$(ARCH)
+base-$(ARCH): aab.conf archlinux-base_$(V_ARCH).tar.gz
+
+archlinux-base_$(V_ARCH).tar.gz: build-current
 
 .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 +45,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