MKINSTALLDIRS
INCLUDES
DO_TEST_SUITE
-ET_DIR
-SS_DIR
LDFLAGS_STATIC
root_sysconfdir
root_libdir
;;
esac
-SS_DIR=`cd ${srcdir}/lib/ss; pwd`
-ET_DIR=`cd ${srcdir}/lib/et; pwd`
-
-
if test "$cross_compiling" = yes ; then
DO_TEST_SUITE=
else
;;
esac
dnl
-dnl Make the ss and et directories work correctly.
-dnl
-SS_DIR=`cd ${srcdir}/lib/ss; pwd`
-ET_DIR=`cd ${srcdir}/lib/et; pwd`
-AC_SUBST(SS_DIR)
-AC_SUBST(ET_DIR)
-dnl
dnl Only try to run the test suite if we're not cross compiling.
dnl
if test "$cross_compiling" = yes ; then
PROGS= debugfs
MANPAGES= debugfs.8
-MK_CMDS= _SS_DIR_OVERRIDE=../lib/ss ../lib/ss/mk_cmds
+MK_CMDS= _SS_DIR_OVERRIDE=$(srcdir)/../lib/ss ../lib/ss/mk_cmds
DEBUG_OBJS= debug_cmds.o debugfs.o util.o ncheck.o icheck.o ls.o \
lsdel.o dump.o set_fields.o logdump.o htree.o unused.o e2freefrag.o \
$(DEPPROFILED_LIBCOM_ERR) $(DEPPROFILED_LIBBLKID) \
$(DEPPROFILED_LIBUUID) $(DEPPROFILED_LIBE2P)
-COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
+COMPILE_ET= _ET_DIR_OVERRIDE=$(srcdir)/../lib/et/et ../lib/et/compile_et
.c.o:
$(E) " CC $<"
check:: compile_et
for i in $(srcdir)/test_cases/*.et ; do \
t=`basename $$i | sed -e 's/.et//'`; \
- ./compile_et --build-tree $$i ; \
+ _ET_DIR_OVERRIDE=$(srcdir) ./compile_et $$i ; \
diff -c $(srcdir)/test_cases/$$t.c $$t.c > $$t.failed; \
if [ $$? -ne 0 ]; then echo Test case $$t failed; exit 1 ; fi ; \
diff -c $(srcdir)/test_cases/$$t.h $$t.h >> $$t.failed; \
datarootdir=@datarootdir@
AWK=@AWK@
-DIR="${DIR-@datadir@/et}"
-ET_DIR="${ET_DIR-@ET_DIR@}"
+DIR=@datadir@/et
if test "$1" = "--build-tree" ; then
shift;
fi
done
+if test -n "$_ET_DIR_OVERRIDE" ; then
+ DIR="$_ET_DIR_OVERRIDE";
+fi
+
if test ! -f "$DIR/et_h.awk" || test ! -f "$DIR/et_c.awk" ; then
- DIR="$ET_DIR"
-# echo "Falling back to $DIR..."
- if test ! -f "$DIR/et_h.awk" || test ! -f "$DIR/et_c.awk" ; then
- echo "compile_et: Couldn't find compile_et's template files."
- exit 1
- fi
+ echo "compile_et: Couldn't find compile_et's template files."
+ exit 1
fi
ROOT=`echo $1 | sed -e s/.et$//`
@DEBUGFS_CMT@DEBUGFS_LIB_OBJS = bb_compat.o inode_io.o write_bb_file.o
-MK_CMDS= _SS_DIR_OVERRIDE=../ss ../ss/mk_cmds
+MK_CMDS= _SS_DIR_OVERRIDE=$(srcdir)/../ss ../ss/mk_cmds
+COMPILE_ET= _ET_DIR_OVERRIDE=$(srcdir)/../et ../et/compile_et
@RESIZER_CMT@RESIZE_LIB_OBJS = dupfs.o
@TEST_IO_CMT@TEST_IO_LIB_OBJS = test_io.o
@ELF_CMT@ $(Q) $(CC) $(ALL_CFLAGS_SHLIB) -fPIC -shared -o elfshared/$*.o -c $<
@BSDLIB_CMT@ $(Q) $(CC) $(ALL_CFLAGS_SHLIB) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
-COMPILE_ET=../et/compile_et --build-tree
-
DISTFILES= Makefile *.c *.h image
ext2_err.et: $(DEP_SUBSTITUTE) $(srcdir)/ext2_err.et.in
BSDLIB_INSTALL_DIR = $(root_libdir)
TAGS=etags
-COMPILE_ET=../et/compile_et --build-tree
-MK_CMDS=_SS_DIR_OVERRIDE=. ./mk_cmds
+MK_CMDS= _SS_DIR_OVERRIDE=$(srcdir) ./mk_cmds
+COMPILE_ET= _ET_DIR_OVERRIDE=$(srcdir)/../et ../et/compile_et
.c.o:
$(E) " CC $<"
#
datarootdir=@datarootdir@
-DIR="${DIR-@datadir@/ss}"
-SS_DIR="@SS_DIR@"
+DIR=@datadir@/ss
AWK=@AWK@
SED=@SED@
fi
if test ! -f $DIR/ct_c.sed || test ! -f $DIR/ct_c.awk ; then
- DIR="$SS_DIR"
-# echo "Falling back to $DIR..."
- if test ! -f "$DIR/ct_c.sed" || test ! -f "$DIR/ct_c.awk" ; then
- echo "mk_cmds: Couldn't find mk_cmds's template files."
- exit 1
- fi
+ echo "mk_cmds: Couldn't find mk_cmds's template files."
+ exit 1
fi
FILE="$1"
@MAKEFILE_LIBRARY@
@MAKEFILE_PROFILE@
-COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
+COMPILE_ET= _ET_DIR_OVERRIDE=$(srcdir)/../et ../et/compile_et
.c.o:
$(E) " CC $<"
LIBS_E2P= $(LIBE2P) $(LIBCOM_ERR)
DEPLIBS_E2P= $(LIBE2P) $(DEPLIBCOM_ERR)
-COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
+COMPILE_ET= _ET_DIR_OVERRIDE=$(srcdir)/../lib/et/et ../lib/et/compile_et
# This nastyness is needed because of jfs_user.h hackery; when we finally
# clean up this mess, we should be able to drop it
@MCONFIG@
-MK_CMDS= _SS_DIR_OVERRIDE=../../lib/ss ../../lib/ss/mk_cmds
+MK_CMDS= _SS_DIR_OVERRIDE=$(srcdir)/../../lib/ss ../../lib/ss/mk_cmds
PROGS= test_icount crcsum
SS_DIR=$(pwd)/lib/ss
MK_CMDS=/tmp/mk_cmds$$.sh
-sed -e "s;@SS_DIR@;$SS_DIR;" < $SS_DIR/mk_cmds.sh.in \
- | sed -e "s/@AWK@/awk/" | sed -e "s/@SED@/sed/" > $MK_CMDS
+sed -e "s/@AWK@/awk/" < $SS_DIR/mk_cmds.sh.in \
+ | sed -e "s/@SED@/sed/" > $MK_CMDS
sed -e "s/@E2FSPROGS_VERSION@/$(git describe)/" < lib/ext2fs/ext2_err.et.in > lib/ext2fs/ext2_err.et
for i in lib/ss/std_rqs debugfs/debug_cmds debugfs/ro_debug_cmds \
debugfs/extent_cmds
do
- /bin/sh $MK_CMDS $i.ct
+ _SS_DIR_OVERRIDE=lib/ss /bin/sh $MK_CMDS $i.ct
mv -f $(basename $i).c $i.c
done
AWK @AWK@
SED @SED@
-ET_DIR @ET_DIR@
-SS_DIR @SS_DIR@
E2FSPROGS_MONTH @E2FSPROGS_MONTH@
E2FSPROGS_YEAR @E2FSPROGS_YEAR@
E2FSPROGS_VERSION @E2FSPROGS_VERSION@