summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile18
-rw-r--r--configure.in1
-rw-r--r--include/Makefile2
-rwxr-xr-xinclude/install-sh (renamed from install-sh)0
4 files changed, 14 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index b472f34..a1a30db 100644
--- a/Makefile
+++ b/Makefile
@@ -9,13 +9,17 @@ ifeq ($(HAVE_BUILDDEFS), yes)
include $(TOPDIR)/include/builddefs
endif
-CONFIGURE = configure include/builddefs include/config.h
-LSRCFILES = configure configure.in aclocal.m4 Makepkgs install-sh exports \
- README VERSION
+CONFIGURE = \
+ aclocal.m4 \
+ configure config.guess config.sub \
+ ltmain.sh m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 \
+ m4/ltversion.m4 m4/lt~obsolete.m4
+LSRCFILES = \
+ configure.in Makepkgs install-sh exports README VERSION \
+ $(CONFIGURE)
LDIRT = config.log .dep config.status config.cache confdefs.h conftest* \
- Logs/* built .census install.* install-dev.* install-lib.* *.gz \
- config.guess config.sub ltmain.sh libtool
+ Logs/* built .census install.* install-dev.* install-lib.* *.gz
LIB_SUBDIRS = include libmisc libattr
TOOL_SUBDIRS = attr getfattr setfattr examples test m4 man doc po debian build
@@ -41,7 +45,8 @@ clean: # if configure hasn't run, nothing to clean
endif
configure include/builddefs:
- libtoolize -c -f
+ libtoolize -c -i -f
+ cp include/install-sh .
aclocal -I m4
autoconf
./configure \
@@ -84,6 +89,7 @@ install-lib: install $(addsuffix -install-lib,$(SUBDIRS))
realclean distclean: clean
rm -f $(LDIRT) $(CONFIGURE)
+ rm -f include/builddefs include/config.h install-sh libtool
rm -rf autom4te.cache Logs
.PHONY: tests root-tests ext-tests
diff --git a/configure.in b/configure.in
index 02f5ca9..ec44926 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,5 @@
AC_INIT(include/attributes.h)
+AC_CONFIG_AUX_DIR([.])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADER(include/config.h)
AC_PREFIX_DEFAULT(/usr)
diff --git a/include/Makefile b/include/Makefile
index a645251..8135352 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/include/builddefs
INCDIR = attr
INST_HFILES = attributes.h xattr.h error_context.h libattr.h
HFILES = $(INST_HFILES) misc.h walk_tree.h
-LSRCFILES = builddefs.in buildmacros buildrules config.h.in
+LSRCFILES = builddefs.in buildmacros buildrules config.h.in install-sh
LDIRT = $(INCDIR)
default: $(INCDIR)
diff --git a/install-sh b/include/install-sh
index e790073..e790073 100755
--- a/install-sh
+++ b/include/install-sh