X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=helper%2FMakefile.am;h=01a6af186789057c20324245e1366316d460f7b1;hb=refs%2Ftags%2F3.4;hp=940a2ee54e0701b557d9d6dcaef4943487910e9e;hpb=0f89ba0654de234429042ffcc91c8a0de94ec98b;p=febootstrap.git

diff --git a/helper/Makefile.am b/helper/Makefile.am
index 940a2ee..01a6af1 100644
--- a/helper/Makefile.am
+++ b/helper/Makefile.am
@@ -40,15 +40,16 @@ febootstrap_supermin_helper_LDADD = \
 noinst_PROGRAMS = init
 init_SOURCES = init.c
 init_CFLAGS = -static
-init_LDFLAGS = -all-static
+init_LDFLAGS = -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,20 @@ febootstrap-supermin-helper.8: febootstrap-supermin-helper.pod
 	  --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
 	  $< > $@
 
-febootstrap-supermin-helper.txt: febootstrap-supermin-helper.pod
-	pod2text $< > $@
+noinst_DATA = \
+	$(top_builddir)/html/febootstrap-supermin-helper.8.html
+
+$(top_builddir)/html/febootstrap-supermin-helper.8.html: febootstrap-supermin-helper.pod
+	mkdir -p $(top_builddir)/html
+	cd $(top_builddir) && pod2html \
+	  --css 'pod.css' \
+	  --htmldir html \
+	  --outfile html/febootstrap-supermin-helper.8.html \
+	  helper/febootstrap-supermin-helper.pod
 
 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