X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=helper%2FMakefile.am;h=fb356a4f1535d6ebb89c4132686d382ece4dc164;hb=68eade3bca4b6024015a319e13e4ad3c5e0d840e;hp=940a2ee54e0701b557d9d6dcaef4943487910e9e;hpb=0f89ba0654de234429042ffcc91c8a0de94ec98b;p=febootstrap.git

diff --git a/helper/Makefile.am b/helper/Makefile.am
index 940a2ee..fb356a4 100644
--- a/helper/Makefile.am
+++ b/helper/Makefile.am
@@ -43,12 +43,13 @@ init_CFLAGS = -static
 init_LDFLAGS = -all-static
 
 # http://www.doof.me.uk/2010/05/07/cute-objcopy-hack/
-ELF_DEFAULT_ARCH = $(shell $(srcdir)/elf-default-arch)
+ELF_DEFAULT_ARCH = $(shell $(srcdir)/elf-default-arch | gawk '{ print $$1 }')
+DEFAULT_ARCH = $(shell $(srcdir)/elf-default-arch | gawk '{ print $$2 }')
 ext2init.o: init
 	strip --strip-all $<
 	@file $< | grep -isq static || \
 	  (echo "*** error: init is not staticly linked"; exit 1)
-	objcopy -I binary -B i386 -O $(ELF_DEFAULT_ARCH) $< $@
+	objcopy -I binary -B $(DEFAULT_ARCH) -O $(ELF_DEFAULT_ARCH) $< $@
 
 man_MANS = \
 	febootstrap-supermin-helper.8
@@ -62,12 +63,9 @@ febootstrap-supermin-helper.8: febootstrap-supermin-helper.pod
 	  --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
 	  $< > $@
 
-febootstrap-supermin-helper.txt: febootstrap-supermin-helper.pod
-	pod2text $< > $@
-
 endif
 
 EXTRA_DIST = \
-	febootstrap-supermin-helper.8 febootstrap-supermin-helper.txt \
-	  febootstrap-supermin-helper.pod \
-	  elf-default-arch
+	febootstrap-supermin-helper.8 \
+	febootstrap-supermin-helper.pod \
+	elf-default-arch