Changeset 5066 for vmdshow/trunk

Timestamp:

Mar 3, 2015 7:17:12 PM (9 years ago)

Author:

ldelgass

Message:

configure/make fixes

Location:

vmdshow/trunk

Files:

• Makefile.in (modified) (1 diff)
• configure (modified) (5 diffs)
• configure.in (modified) (1 diff)

vmdshow/trunk/Makefile.in

@@ -1 @@
-LOGDIR=@LOGDIR@
-STATSDIR=@STATSDIR@
-RPDIR=@prefix@
+prefix          = @prefix@
+srcdir          = @srcdir@
 
-install:
-        install -m 0644 vmdserver.tcl $(RPDIR)/lib/vmd
+LOGDIR          = @LOGDIR@
+STATSDIR        = @STATSDIR@
+INSTALL         = @INSTALL@
+MKDIR_P         = @MKDIR_P@
+VPATH           = $(srcdir)
+
+DESTDIR         = $(prefix)/lib/vmd
+
+install: vmdserver.tcl
+        $(MKDIR_P) -m 0755 $(DESTDIR)
+        install -m 0644 -t $(DESTDIR) $<
 
 clean:

vmdshow/trunk/configure

@@ -589 +589 @@
 STATSDIR
 LOGDIR
+MKDIR_P
+LN_S
 INSTALL_DATA
 INSTALL_SCRIPT
@@ -1830 +1832 @@
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if ${ac_cv_path_mkdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in mkdir gmkdir; do
+         for ac_exec_ext in '' $ac_executable_extensions; do
+           as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+           case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+             'mkdir (GNU coreutils) '* | \
+             'mkdir (coreutils) '* | \
+             'mkdir (fileutils) '4.1*)
+               ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+               break 3;;
+           esac
+         done
+       done
+  done
+IFS=$as_save_IFS
+
+fi
+
+  test -d ./--version && rmdir ./--version
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
 
 
@@ -2442 +2497 @@
 srcdir='$srcdir'
 INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
 test -n "\$AWK" || AWK=awk
 _ACEOF
@@ -2881 +2937 @@
   *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
   esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
 _ACEOF
 
@@ -2935 +2996 @@
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "

vmdshow/trunk/configure.in

@@ -29 +29 @@
 
 AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MKDIR_P
 
 AC_SUBST(LOGDIR)