Merge branch 'fixes'

* fixes:
  Makefile: remove HELPER_BEE_C variable references
  Makefile: remove compile option -lcrypt from bee-cache-inventory
  Makefile: remove target 'compat'
  Makefile: install info-dir hook
  hooks: info-dir: fix missing value for BEE_METAFORMAT in old bee packages
  filelist2content: strip $root from symlink targets
  filelist2content: remove trailing whitespaces

Makefile

@@ -49,9 +49,6 @@ sed-rules = -e 's,@PREFIX@,${PREFIX},g' \
 	    -e 's,@BEE_VERSION@,${BEE_VERSION},g' \
 	    -e 's,@DATADIR@,${DATADIR},g'
 
-sed-compat-bashlt4 = -e 'sx\$${\([a-zA-Z_]*\),,}x\$$(tr A-Z a-z <<<\$${\1})xg' \
-                     -e 'sx\$${\([a-zA-Z_]*\)^^}x\$$(tr a-z A-Z <<<\$${\1})xg'
-
 PROGRAMS_C+=beecut
 PROGRAMS_C+=beeflock
 PROGRAMS_C+=beegetopt
@@ -103,6 +100,7 @@ HELPER_HOOKS_SHELL+=gdk-pixbuf-query-loaders
 HELPER_HOOKS_SHELL+=mandb
 HELPER_HOOKS_SHELL+=systemd-tmpfiles
 HELPER_HOOKS_SHELL+=gconf-install-schemas
+HELPER_HOOKS_SHELL+=info-dir
 
 MANPAGES+=bee.1
 MANPAGES+=bee-check.1
@@ -119,23 +117,12 @@ CONFIG_TEMPLATES+=fallback
 CONFIG_FILES+=skiplist
 CONFIG_FILES+=beerc
 
-COMPAT_BASHLT4+=beesh.sh
-COMPAT_BASHLT4+=bee-check.sh
-COMPAT_BASHLT4+=buildtypes/autogen.sh
-COMPAT_BASHLT4+=buildtypes/configure.sh
-COMPAT_BASHLT4+=buildtypes/make.sh
-
 .SUFFIXES: .in .sh .sh.in
 
 all: build
 
 build: shellscripts buildtypes cprograms manpages
 
-compat: compat-bashlt4
-
-compat-bashlt4: ${COMPAT_BASHLT4}
-	$(call quiet-command, sed ${sed-compat-bashlt4} -i ${COMPAT_BASHLT4}, "COMPAT	$^" )
-
 SHELLSCRIPTS=$(PROGRAMS_SHELL) $(HELPER_BEE_SHELL) $(HELPER_SHELL)
 
 BEEVERSION_OBJECTS=beeversion.o bee_version_parse.o bee_version_compare.o bee_version_output.o
@@ -151,7 +138,7 @@ bee_MANPAGES=$(addprefix manpages/,${MANPAGES})
 bee_BUILDTYPES=$(addsuffix .sh,$(addprefix buildtypes/,$(BUILDTYPES)))
 
 shellscripts: $(addsuffix .sh,$(SHELLSCRIPTS)) $(LIBRARY_SHELL)
-cprograms:    $(PROGRAMS_C) ${HELPER_BEE_C} ${HELPER_C}
+cprograms:    $(PROGRAMS_C) ${HELPER_C}
 manpages:     ${bee_MANPAGES}
 buildtypes:   ${bee_BUILDTYPES}
 
@@ -177,7 +164,7 @@ beeflock: $(addprefix src/, ${BEEFLOCK_OBJECTS})
 	$(call quiet-command,${CC} ${LDFLAGS} -o $@ $^,"LD	$@")
 
 bee-cache-inventory: $(addprefix src/, ${BEECACHEINVENTORY_OBJECTS})
-	$(call quiet-command,${CC} ${LDFLAGS} -lcrypt -o $@ $^,"LD	$@")
+	$(call quiet-command,${CC} ${LDFLAGS} -o $@ $^,"LD	$@")
 
 %.o: %.c
 	$(call quiet-command,${CC} ${CFLAGS} -o $@ -c $^,"CC	$@")
@@ -194,7 +181,6 @@ bee-cache-inventory: $(addprefix src/, ${BEECACHEINVENTORY_OBJECTS})
 clean:
 	$(call quiet-command,rm -f $(addsuffix .sh,${SHELLSCRIPTS}) $(LIBRARY_SHELL) $(HELPER_SHELL),"CLEAN	<various>.sh")
 	$(call quiet-command,rm -f ${PROGRAMS_C},"CLEAN	${PROGRAMS_C}")
-	$(call quiet-command,rm -f ${HELPER_BEE_C},"CLEAN	${HELPER_BEE_C}")
 	$(call quiet-command,rm -f ${HELPER_C},"CLEAN	${HELPER_C}")
 	$(call quiet-command,rm -f src/*.o,"CLEAN	c object files")
 	$(call quiet-command,rm -f ${bee_MANPAGES},"CLEAN	manpages")
@@ -215,7 +201,7 @@ ${DESTDIR}${BINDIR}/%: % install-dir-bindir
 ${DESTDIR}${BINDIR}/%: %.sh install-dir-bindir
 	$(call quiet-install,0755,$<,$@)
 
-install-tools: $(addprefix ${DESTDIR}${LIBEXECDIR}/bee/bee.d/,${HELPER_BEE_SHELL} ${HELPER_BEE_C})
+install-tools: $(addprefix ${DESTDIR}${LIBEXECDIR}/bee/bee.d/,${HELPER_BEE_SHELL})
 
 install-dir-tools:
 	$(call quiet-installdir,0755,${DESTDIR}${LIBEXECDIR}/bee/bee.d)

hooks/info-dir.sh

@@ -44,7 +44,7 @@ fi
 
 . ${BEE_METADIR}/${pkg}/META
 
-if [ ! "${BEEMETAFORMAT}" -ge 2 ] ; then
+if [ ! "${BEEMETAFORMAT:=0}" -ge 2 ] ; then
     exit 0
 fi
 
@@ -63,4 +63,4 @@ case "${action}" in
             ${INSTALLINFO} --delete ${i} ${DIRFILE} >/dev/null
         done
         ;;
-esac
+esac

src/filelist2content.sh.in

@@ -113,9 +113,10 @@ function do_f2c() {
                 exit 1
             fi
 
-            echo -n ":md5=${md5%% *}"        
+            echo -n ":md5=${md5%% *}"
         elif [ "${type}" = "symlink" ] ; then
-            file="${file}//$(readlink ${root}${file})"
+            target=$(readlink ${root}${file})
+            file="${file}//${target#${root}}"
         elif [ "${type}" = "block" -o "${type}" = "char" ] ; then
             echo -n ":major=${major}"
             echo -n ":minor=${minor}"