Author: benny
Date: 2006-10-28 09:34:53 +0000 (Sat, 28 Oct 2006)
New Revision: 23537
Modified:
terminal/trunk/ChangeLog
terminal/trunk/configure.in.in
terminal/trunk/terminal/Makefile.am
Log:
2006-10-28 Benedikt Meurer <[EMAIL PROTECTED]>
* configure.in.in, terminal/Makefile.am: Don't install the symlink
from Terminal to terminal on Win32 platforms. Bug #2433.
Modified: terminal/trunk/ChangeLog
===================================================================
--- terminal/trunk/ChangeLog 2006-10-28 09:31:20 UTC (rev 23536)
+++ terminal/trunk/ChangeLog 2006-10-28 09:34:53 UTC (rev 23537)
@@ -1,3 +1,8 @@
+2006-10-28 Benedikt Meurer <[EMAIL PROTECTED]>
+
+ * configure.in.in, terminal/Makefile.am: Don't install the symlink
+ from Terminal to terminal on Win32 platforms. Bug #2433.
+
2006-10-27 Benedikt Meurer <[EMAIL PROTECTED]>
* terminal/main.c(usage): Fix incorrect english in usage.
Modified: terminal/trunk/configure.in.in
===================================================================
--- terminal/trunk/configure.in.in 2006-10-28 09:31:20 UTC (rev 23536)
+++ terminal/trunk/configure.in.in 2006-10-28 09:34:53 UTC (rev 23537)
@@ -55,6 +55,21 @@
AC_ISC_POSIX()
dnl ********************************
+dnl *** Check for Win32 variants ***
+dnl ********************************
+AC_MSG_CHECKING([if building for some Win32 platform])
+case "$host" in
+*-*-mingw*|*-*-cygwin*)
+ ac_bm_platform_win32=yes
+ ;;
+*)
+ ac_bm_platform_win32=no
+ ;;
+esac
+AC_MSG_RESULT([$ac_bm_platform_win32])
+AM_CONDITIONAL([PLATFORM_WIN32], [test x"$ac_bm_platform_win32" = x"yes"])
+
+dnl ********************************
dnl *** Check for basic programs ***
dnl ********************************
AC_PROG_CC()
Modified: terminal/trunk/terminal/Makefile.am
===================================================================
--- terminal/trunk/terminal/Makefile.am 2006-10-28 09:31:20 UTC (rev 23536)
+++ terminal/trunk/terminal/Makefile.am 2006-10-28 09:34:53 UTC (rev 23537)
@@ -85,10 +85,12 @@
$(VTE_LIBS) \
$(TERMINAL_LIBS)
+if !PLATFORM_WIN32
# install symlink to 'terminal'
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(bindir)
( cd $(DESTDIR)$(bindir) ; ln -sf Terminal terminal )
+endif
if HAVE_DBUS
Terminal_CFLAGS += \
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
