From b6d274f7c67333e9d4b191b0d27a00be6a2d723f Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Wed, 16 Feb 2011 12:01:39 -0600 Subject: [PATCH] e2fsprogs: create com_err.h link in includedir After debian bug #192277, debian/rules started making a symlink to com_err.h in /usr/include. Now I have Fedora bug #550889 for the same issue, and perhaps it's time to make this link by default, rather than fixing it up in packaging steps? [ Changed by tytso to remove the explicit -s option; this will default to creating a hard link by default, which slightly faster. If people want to use symlinks for all links during the install process, they can use configure option --enable-symlink-install. The reason for this change is that some file systems, like AFS, don't support symlinks, and AFS users complain when they can't build or install into AFS. So I don't want to use symlinks unconditionally without a way of switching things back and forth, and it's easier if we just make all links made during the install process to be hard links or sym links. ] Signed-off-by: Eric Sandeen Signed-off-by: Theodore Ts'o --- debian/rules | 2 -- lib/et/Makefile.in | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 9fe59e63..41fca240 100755 --- a/debian/rules +++ b/debian/rules @@ -326,8 +326,6 @@ install-std: build ${INSTALL_PROGRAM} $(E2FSCK_STATIC) ${tmpdir}/sbin cp ${mandir}/man8/e2fsck.8 ${mandir}/man8/e2fsck.static.8 - ln -s et/com_err.h ${tmpdir}/usr/include - dh_movefiles test -z "`find ${tmpdir} -type f`" diff --git a/lib/et/Makefile.in b/lib/et/Makefile.in index a7e273cd..203dbacd 100644 --- a/lib/et/Makefile.in +++ b/lib/et/Makefile.in @@ -96,6 +96,7 @@ install:: compile_et libcom_err.a $(HFILES) installdirs com_err.pc echo " INSTALL_DATA $(includedir)/et/$$i"; \ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/et/$$i; \ done + $(Q) $(LN) $(LINK_INSTALL_FLAGS) $(includedir)/et/com_err.h $(DESTDIR)$(includedir) $(Q) for i in $(SHARE_FILES); do \ echo " INSTALL_DATA $(datadir)/et/$$i"; \ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/et/$$i; \