carbon2-commit: Merge one line in Makefile.in.in by hand.

changeset: 4475:11515817d9ca86ee8caafb52872c0a0e7cd0705a tag: tip user: Aidan Kehoe <kehoea(a)parhasard.net&gt; date: Sun May 11 10:33:18 2008 +0200 files: ChangeLog.carbon2 Makefile.in.in description: Merge one line in Makefile.in.in by hand. 2008-05-11 Aidan Kehoe <kehoea(a)parhasard.net&gt; * Makefile.in.in: Clean up a conditional after an automated merge had a non-easily-resolved conflict. diff -r 80cf40f347031a446ee2dbeedfb6ecb17e6aedfc -r 11515817d9ca86ee8caafb52872c0a0e7cd0705a ChangeLog.carbon2 --- a/ChangeLog.carbon2 Sun May 11 10:05:47 2008 +0200 +++ b/ChangeLog.carbon2 Sun May 11 10:33:18 2008 +0200 ＠＠ -1,3 +1,8 ＠＠ 2008-01-24 Marcus Crestani <crestani＠x +2008-05-11 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * Makefile.in.in: Clean up a conditional after an automated merge + had a non-easily-resolved conflict. + 2008-01-24 Marcus Crestani <crestani(a)xemacs.org&gt; * carbon/build.sh: Change package location from lib/ to share/. diff -r 80cf40f347031a446ee2dbeedfb6ecb17e6aedfc -r 11515817d9ca86ee8caafb52872c0a0e7cd0705a Makefile.in.in --- a/Makefile.in.in Sun May 11 10:05:47 2008 +0200 +++ b/Makefile.in.in Sun May 11 10:33:18 2008 +0200 ＠＠ -446,7 +446,8 ＠＠ install-arch-dep: mkdir -chmod 0755 ${bindir}/${PROGNAME}-${version} cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME} cd ${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${SHEBANG_PROGNAME} -# endif /* CYGWIN */ +# endif /* CYGWIN */ +# endif /* HAVE_CARBON */ #endif /* WIN32_NATIVE */ if test "${prefix}" != "${exec_prefix}"; then \ $(MAKEPATH) ${exec_prefix}/lib/${instvardir}; \ _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches