diff -Nurp e2fsprogs-1.42.orig/lib/et/compile_et.sh.in e2fsprogs-1.42/lib/et/compile_et.sh.in --- e2fsprogs-1.42.orig/lib/et/compile_et.sh.in 2009-08-13 04:39:57.000000000 +0300 +++ e2fsprogs-1.42/lib/et/compile_et.sh.in 2011-12-29 17:47:02.770419594 +0200 @@ -5,12 +5,14 @@ datarootdir=@datarootdir@ AWK=@AWK@ DIR="${DIR-@datadir@/et}" +# BUILD start ET_DIR="@ET_DIR@" if test "$1" = "--build-tree" ; then shift; DIR="$ET_DIR" fi +# BUILD end if test "x$1" = x ; then echo "Usage: compile_et file" @@ -30,12 +32,16 @@ do done if test ! -f "$DIR/et_h.awk" || test ! -f "$DIR/et_c.awk" ; then +# BUILD start DIR="$ET_DIR" # echo "Falling back to $DIR..." if test ! -f "$DIR/et_h.awk" || test ! -f "$DIR/et_c.awk" ; then +# BUILD end echo "compile_et: Couldn't find compile_et's template files." exit 1 +# BUILD start fi +# BUILD end fi ROOT=`echo $1 | sed -e s/.et$//` diff -Nurp e2fsprogs-1.42.orig/lib/et/Makefile.in e2fsprogs-1.42/lib/et/Makefile.in --- e2fsprogs-1.42.orig/lib/et/Makefile.in 2011-09-19 00:33:47.000000000 +0300 +++ e2fsprogs-1.42/lib/et/Makefile.in 2011-12-29 17:47:02.770419594 +0200 @@ -65,6 +65,10 @@ HTML=texi2html -split_chapter PS2PDF=ps2pdf +compile_et.install: compile_et + @perl -ne '/^# BUILD start/ ... /^# BUILD end/ or print' $< > $@ + @$(CHMOD) +x $@ + com_err.ps : com_err.dvi com_err.dvi: com_err.texinfo @@ -87,7 +91,7 @@ installdirs:: $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) \ $(DESTDIR)$(man3dir) $(DESTDIR)$(libdir)/pkgconfig -install:: compile_et libcom_err.a $(HFILES) installdirs com_err.pc +install:: compile_et libcom_err.a $(HFILES) installdirs com_err.pc compile_et.install $(E) " INSTALL_DATA $(libdir)/libcom_err.a" $(Q) $(INSTALL_DATA) libcom_err.a $(DESTDIR)$(libdir)/libcom_err.a -$(Q) $(RANLIB) $(DESTDIR)$(libdir)/libcom_err.a @@ -103,7 +107,7 @@ install:: compile_et libcom_err.a $(HFIL $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/et/$$i; \ done $(E) " INSTALL_SCRIPT $(bindir)/compile_et" - $(Q) $(INSTALL_SCRIPT) compile_et $(DESTDIR)$(bindir)/compile_et + $(Q) $(INSTALL_SCRIPT) compile_et.install $(DESTDIR)$(bindir)/compile_et $(E) " INSTALL_DATA $(man3dir)/com_err.3" $(Q) $(INSTALL_DATA) $(srcdir)/com_err.3 $(DESTDIR)$(man3dir)/com_err.3 $(E) " INSTALL_DATA $(man1dir)/compile_et.1" diff -Nurp e2fsprogs-1.42.orig/lib/ss/Makefile.in e2fsprogs-1.42/lib/ss/Makefile.in --- e2fsprogs-1.42.orig/lib/ss/Makefile.in 2011-09-19 00:33:47.000000000 +0300 +++ e2fsprogs-1.42/lib/ss/Makefile.in 2011-12-29 17:47:02.770419594 +0200 @@ -119,6 +119,10 @@ mk_cmds: $(DEP_SUBSTITUTE) $(srcdir)/mk_ $(Q) $(SUBSTITUTE) $(srcdir)/mk_cmds.sh.in mk_cmds $(Q) $(CHMOD) +x mk_cmds +mk_cmds.install: mk_cmds + @perl -ne '/^# BUILD start/ ... /^# BUILD end/ or print' $< > $@ + @$(CHMOD) +x $@ + ss.pc: $(srcdir)/ss.pc.in $(top_builddir)/config.status $(E) " CONFIG.STATUS $@" $(Q) cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status @@ -129,7 +133,7 @@ installdirs:: $(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss \ $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)/pkgconfig -install:: libss.a $(INSTALL_HFILES) installdirs ss_err.h mk_cmds ss.pc +install:: libss.a $(INSTALL_HFILES) installdirs ss_err.h mk_cmds ss.pc mk_cmds.install $(E) " INSTALL_DATA $(DESTDIR)$(libdir)/libss.a" $(Q) $(INSTALL_DATA) libss.a $(DESTDIR)$(libdir)/libss.a -$(Q) $(RANLIB) $(DESTDIR)$(libdir)/libss.a @@ -146,7 +150,7 @@ install:: libss.a $(INSTALL_HFILES) inst $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/ss/$$i; \ done $(E) " INSTALL $(bindir)/mk_cmds" - $(Q) $(INSTALL) mk_cmds $(DESTDIR)$(bindir)/mk_cmds + $(Q) $(INSTALL) mk_cmds.install $(DESTDIR)$(bindir)/mk_cmds $(E) " INSTALL_DATA $(man1dir)/mk_cmds.1" $(Q) $(INSTALL_DATA) $(srcdir)/mk_cmds.1 $(DESTDIR)$(man1dir)/mk_cmds.1 $(E) " INSTALL_DATA $(libdir)/pkgconfig/ss.pc" diff -Nurp e2fsprogs-1.42.orig/lib/ss/mk_cmds.sh.in e2fsprogs-1.42/lib/ss/mk_cmds.sh.in --- e2fsprogs-1.42.orig/lib/ss/mk_cmds.sh.in 2009-08-13 04:39:57.000000000 +0300 +++ e2fsprogs-1.42/lib/ss/mk_cmds.sh.in 2011-12-29 17:47:02.770419594 +0200 @@ -4,7 +4,9 @@ datarootdir=@datarootdir@ DIR="${DIR-@datadir@/ss}" +# BUILD start SS_DIR="@SS_DIR@" +# BUILD end AWK=@AWK@ SED=@SED@ @@ -30,12 +32,16 @@ if test -n "$_SS_DIR_OVERRIDE" ; then fi if test ! -f $DIR/ct_c.sed || test ! -f $DIR/ct_c.awk ; then +# BUILD start DIR="$SS_DIR" # echo "Falling back to $DIR..." if test ! -f "$DIR/ct_c.sed" || test ! -f "$DIR/ct_c.awk" ; then +# BUILD end echo "mk_cmds: Couldn't find mk_cmds's template files." exit 1 +# BUILD start fi +# BUILD end fi FILE="$1"