On 09/22/13 05:07 PM, Gaetan Nadon wrote:
Autoconf recommends using LN_S to safeguard against actual or future
portability issues. Being open source, X can be ported on platforms we are
not aware of today.
Autoconf:
"Symbolic links are not available on old systems; use ‘$(LN_S)’
as a portable substitute".
AC_PROG_LN_S is brought in by AC_PROG_LIBTOOL
Signed-off-by: Gaetan Nadon <[email protected]>
---
src/Makefile.am | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 951dc26..49b3ddb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -84,10 +84,10 @@ if !PLATFORM_WIN32
install-exec-hook::
if PLATFORM_DARWIN
-rm -f $(DESTDIR)$(libdir)/libXaw.6.@LIBEXT@
- (cd $(DESTDIR)$(libdir) && ln -s libXaw6.6.@LIBEXT@ libXaw.6.@LIBEXT@)
+ (cd $(DESTDIR)$(libdir) && $(LN_S) libXaw6.6.@LIBEXT@ libXaw.6.@LIBEXT@)
else
-rm -f $(DESTDIR)$(libdir)/libXaw.@[email protected]
- (cd $(DESTDIR)$(libdir) && ln -s libXaw6.@[email protected] libXaw.@[email protected])
+ (cd $(DESTDIR)$(libdir) && $(LN_S) libXaw6.@[email protected] libXaw.@[email protected])
endif
uninstall-local::
@@ -123,10 +123,10 @@ if !PLATFORM_WIN32
install-exec-hook::
if PLATFORM_DARWIN
-rm -f $(DESTDIR)$(libdir)/libXaw.7.@LIBEXT@
- (cd $(DESTDIR)$(libdir) && ln -s libXaw7.7.@LIBEXT@ libXaw.7.@LIBEXT@)
+ (cd $(DESTDIR)$(libdir) $(LN_S) libXaw7.7.@LIBEXT@ libXaw.7.@LIBEXT@)
else
-rm -f $(DESTDIR)$(libdir)/libXaw.@[email protected]
- (cd $(DESTDIR)$(libdir) && ln -s libXaw7.@[email protected] libXaw.@[email protected])
+ (cd $(DESTDIR)$(libdir) $(LN_S) libXaw7.@[email protected] libXaw.@[email protected])
Looks like you lost the && in the last two bits there, so they become extra
arguments to cd, not a second command to run.
--
-Alan Coopersmith- [email protected]
Oracle Solaris Engineering - http://blogs.oracle.com/alanc
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
