Changeset 3126 for trunk

Timestamp:

Apr 15, 2007, 9:33:12 PM (18 years ago)

Author:

bird

Message:

merged OS/2 changes.

Location:

trunk/essentials/sys-devel/automake-1.4

Files:

• aclocal.in (modified) (1 diff)
• automake.in (modified) (1 diff)
• compile.am (modified) (1 diff)
• m4/error.m4 (modified) (1 diff)
• mdate-sh (modified) (1 diff)

trunk/essentials/sys-devel/automake-1.4/aclocal.in

@@ -32 +32 @@
 $APIVERSION = "@APIVERSION@";
 $PACKAGE = "@PACKAGE@";
-$prefix = "@prefix@";
+$prefix = $ENV{'UNIXROOT'}."@prefix@";
 # Note that this isn't pkgdatadir, but a separate directory.
 # Note also that the versioned directory is handled later.
-$acdir = "@datadir@/aclocal";
+$acdir = "${prefix}/share/aclocal";
 $default_acdir = $acdir;
 

trunk/essentials/sys-devel/automake-1.4/automake.in

@@ -32 +32 @@
 $VERSION = "@VERSION@";
 $PACKAGE = "@PACKAGE@";
-$prefix = "@prefix@";
-$am_dir = "@datadir@/@PACKAGE@-@APIVERSION@";
+$prefix = $ENV{'UNIXROOT'}."@prefix@";
+$am_dir = "${prefix}/share/@PACKAGE@-@APIVERSION@";
 $TAR = "@TAR@";
 

trunk/essentials/sys-devel/automake-1.4/compile.am

@@ -22 +22 @@
 OBJEXT# and only if it is available.
 OBJEXT.c.obj:
-OBJEXT  $(COMPILE) -c `cygpath -w $<`
+OBJEXT  $(COMPILE) -c $<
+#OBJEXT $(COMPILE) -c `cygpath -w $<`
 
 .s.o:

trunk/essentials/sys-devel/automake-1.4/m4/error.m4

@@ -8 +8 @@
               am_cv_lib_error_at_line=no)])
  if test $am_cv_lib_error_at_line = no; then
+   if test -n "$OBJEXT"; then
+     LIBOBJS="$LIBOBJS error.$OBJEXT"
+   else
    LIBOBJS="$LIBOBJS error.o"
+   fi
  fi
  AC_SUBST(LIBOBJS)dnl

trunk/essentials/sys-devel/automake-1.4/mdate-sh

@@ -36 +36 @@
 # (3 shifts here, the next inside the loop).
 shift
-shift
-shift
+# OS/2 doesn't necessarily have group/user columns, so we skip two shifts
+if test -z "$OS2_SHELL"; then
+  shift
+  shift
+fi
 
 # Find the month.  Next argument is day, followed by the year or time.