Changeset 1657

Timestamp:

Jun 21, 2019, 2:04:39 PM (6 years ago)

Author:

Silvan Scherrer

Message:

use the right bindir for rpm.exe

Location:

rpm/trunk

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (3 diffs)
• tests/Makefile.am (modified) (1 diff)

rpm/trunk/Makefile.am

@@ -92 +92 @@
 
 
+if BUILD_OS_IS_OS2
+rpmbindir = $(bindir)
+else
 rpmbindir = `echo $(bindir) | $(SED) -e s,usr/bin,bin,`
+endif
 rpmbin_PROGRAMS = rpm
 

rpm/trunk/configure.ac

@@ -96 +96 @@
 dnl Find some common programs
 dnl
-AC_PATH_PROGS(__7ZIP, [7zip 7za 7z], /usr/bin/7za, $MYPATH)
-AC_PATH_PROG(__BZIP2, bzip2, /usr/bin/bzip2, $MYPATH)
-AC_PATH_PROG(__CAT, cat, /bin/cat, $MYPATH)
-AC_PATH_PROG(__CHGRP, chgrp, /bin/chgrp, $MYPATH)
-AC_PATH_PROG(__CHMOD, chmod, /bin/chmod, $MYPATH)
-AC_PATH_PROG(__CHOWN, chown, /bin/chown, $MYPATH)
-AC_PATH_PROG(__CP, cp, /bin/cp, $MYPATH)
-AC_PATH_PROG(__CPIO, cpio, /bin/cpio, $MYPATH)
-AC_PATH_PROG(__CURL, curl, /usr/bin/curl, $MYPATH)
-AC_PATH_PROG(__FILE, file, /usr/bin/file, $MYPATH)
-AC_PATH_PROG(__GPG, gpg, /usr/bin/gpg, $MYPATH)
-AC_PATH_PROG(__GREP, grep, /bin/grep, $MYPATH)
-AC_PATH_PROG(__GZIP, gzip, /bin/gzip, $MYPATH)
-AC_PATH_PROG(__UNZIP, unzip, /usr/bin/unzip, $MYPATH)
-AC_PATH_PROG(__ID, id, /usr/bin/id, $MYPATH)
-AC_PATH_PROG(__INSTALL, install, /usr/bin/install, $MYPATH)
-AC_PATH_PROG(__LRZIP, lrzip, /usr/bin/lrzip, $MYPATH)
-AC_PATH_PROG(__LZIP, lzip, /usr/bin/lzip, $MYPATH)
-AC_PATH_PROG(__XZ, xz, /usr/bin/xz, $MYPATH)
-AC_PATH_PROG(__MAKE, make, /usr/bin/make, $MYPATH)
-AC_PATH_PROG(__MKDIR, mkdir, /bin/mkdir, $MYPATH)
-AC_PATH_PROG(__MV, mv, /bin/mv, $MYPATH)
-AC_PATH_PROG(__PATCH, patch, /usr/bin/patch, $MYPATH)
-AC_PATH_PROG(__RESTORECON, restorecon, /sbin/restorecon, $MYPATH)
+AC_PATH_PROGS(__7ZIP, [7zip 7za 7z], /@unixroot/usr/bin/7za, $MYPATH)
+AC_PATH_PROG(__BZIP2, bzip2, /@unixroot/usr/bin/bzip2, $MYPATH)
+AC_PATH_PROG(__CAT, cat, /@unixroot/usr/bin/cat, $MYPATH)
+AC_PATH_PROG(__CHGRP, chgrp, /@unixroot/usr/bin/chgrp, $MYPATH)
+AC_PATH_PROG(__CHMOD, chmod, /@unixroot/usr/bin/chmod, $MYPATH)
+AC_PATH_PROG(__CHOWN, chown, /@unixroot/usr/bin/chown, $MYPATH)
+AC_PATH_PROG(__CP, cp, /@unixroot/usr/bin/cp, $MYPATH)
+AC_PATH_PROG(__CPIO, cpio, /@unixroot/usr/bin/cpio, $MYPATH)
+AC_PATH_PROG(__CURL, curl, /@unixroot/usr/bin/curl, $MYPATH)
+AC_PATH_PROG(__FILE, file, /@unixroot/usr/bin/file, $MYPATH)
+AC_PATH_PROG(__GPG, gpg, /@unixroot/usr/bin/gpg, $MYPATH)
+AC_PATH_PROG(__GREP, grep, /@unixroot/usr/bin/grep, $MYPATH)
+AC_PATH_PROG(__GZIP, gzip, /@unixroot/usr/bin/gzip, $MYPATH)
+AC_PATH_PROG(__UNZIP, unzip, /@unixroot/usr/bin/unzip, $MYPATH)
+AC_PATH_PROG(__ID, id, /@unixroot/usr/bin/id, $MYPATH)
+AC_PATH_PROG(__INSTALL, install, /@unixroot/usr/bin/install, $MYPATH)
+AC_PATH_PROG(__LRZIP, lrzip, /@unixroot/usr/bin/lrzip, $MYPATH)
+AC_PATH_PROG(__LZIP, lzip, /@unixroot/usr/bin/lzip, $MYPATH)
+AC_PATH_PROG(__XZ, xz, /@unixroot/usr/bin/xz, $MYPATH)
+AC_PATH_PROG(__MAKE, make, /@unixroot/usr/bin/make, $MYPATH)
+AC_PATH_PROG(__MKDIR, mkdir, /@unixroot/usr/bin/mkdir, $MYPATH)
+AC_PATH_PROG(__MV, mv, /@unixroot/usr/bin/mv, $MYPATH)
+AC_PATH_PROG(__PATCH, patch, /@unixroot/usr/bin/patch, $MYPATH)
+AC_PATH_PROG(__RESTORECON, restorecon, /@unixroot/usr/sbin/restorecon, $MYPATH)
 AC_MSG_CHECKING(old version of patch)
     PATCHVERSION=`patch --version 2>&1`
@@ -131 +131 @@
     fi
 
-AC_PATH_PROG(__PERL, perl, /usr/bin/perl, $MYPATH)
-AC_PATH_PROG(__PGP, pgp, /usr/bin/pgp, $MYPATH)
-AC_PATH_PROG(__PYTHON, python, /usr/bin/python, $MYPATH)
-AC_PATH_PROG(__RM, rm, /bin/rm, $MYPATH)
-AC_PATH_PROG(__RSH, rsh, /usr/bin/rsh, $MYPATH)
-AC_PATH_PROG(__SED, sed, /bin/sed, $MYPATH)
-AC_PATH_PROG(__SEMODULE, semodule, /usr/bin/semodule, $MYPATH)
-AC_PATH_PROG(__SSH, ssh, /usr/bin/ssh, $MYPATH)
-AC_PATH_PROG(__TAR, tar, /bin/tar, $MYPATH)
-
-AC_PATH_PROG(__LD, ld, /usr/bin/ld, $MYPATH)
-AC_PATH_PROG(__NM, nm, /usr/bin/nm, $MYPATH)
-AC_PATH_PROG(__OBJCOPY, objcopy, /usr/bin/objcopy, $MYPATH)
-AC_PATH_PROG(__OBJDUMP, objdump, /usr/bin/objdump, $MYPATH)
-AC_PATH_PROG(__STRIP, strip, /usr/bin/strip, $MYPATH)
-
-AC_PATH_PROG(__GIT, git, /usr/bin/git, $MYPATH)
-AC_PATH_PROG(__HG, hg, /usr/bin/hg, $MYPATH)
-AC_PATH_PROG(__BZR, bzr, /usr/bin/bzr, $MYPATH)
-AC_PATH_PROG(__QUILT, quilt, /usr/bin/quilt, $MYPATH)
+AC_PATH_PROG(__PERL, perl, /@unixroot/usr/bin/perl, $MYPATH)
+AC_PATH_PROG(__PGP, pgp, /@unixroot/usr/bin/pgp, $MYPATH)
+AC_PATH_PROG(__PYTHON, python, /@unixroot/usr/bin/python, $MYPATH)
+AC_PATH_PROG(__RM, rm, /@unixroot/usr/bin/rm, $MYPATH)
+AC_PATH_PROG(__RSH, rsh, /@unixroot/usr/bin/rsh, $MYPATH)
+AC_PATH_PROG(__SED, sed, /@unixroot/usr/bin/sed, $MYPATH)
+AC_PATH_PROG(__SEMODULE, semodule, /@unixroot/usr/bin/semodule, $MYPATH)
+AC_PATH_PROG(__SSH, ssh, /@unixroot/usr/bin/ssh, $MYPATH)
+AC_PATH_PROG(__TAR, tar, /@unixroot/usr/bin/tar, $MYPATH)
+
+AC_PATH_PROG(__LD, ld, /@unixroot/usr/bin/ld, $MYPATH)
+AC_PATH_PROG(__NM, nm, /@unixroot/usr/bin/nm, $MYPATH)
+AC_PATH_PROG(__OBJCOPY, objcopy, /@unixroot/usr/bin/objcopy, $MYPATH)
+AC_PATH_PROG(__OBJDUMP, objdump, /@unixroot/usr/bin/objdump, $MYPATH)
+AC_PATH_PROG(__STRIP, strip, /@unixroot/usr/bin/strip, $MYPATH)
+
+AC_PATH_PROG(__GIT, git, /@unixroot/usr/bin/git, $MYPATH)
+AC_PATH_PROG(__HG, hg, /@unixroot/usr/bin/hg, $MYPATH)
+AC_PATH_PROG(__BZR, bzr, /@unixroot/usr/bin/bzr, $MYPATH)
+AC_PATH_PROG(__QUILT, quilt, /@unixroot/usr/bin/quilt, $MYPATH)
 
 AC_PATH_PROG(__FAKECHROOT, fakechroot, no, $MYPATH)
@@ -845 +845 @@
 AM_CONDITIONAL([DOXYGEN],[test "$DOXYGEN" != no])
 AM_CONDITIONAL([HACKINGDOCS],[test "$with_hackingdocs" = yes])
-
+AM_CONDITIONAL(BUILD_OS_IS_OS2, [test "$build_os" = os2-emx])
 AC_PATH_PROG(AUTOM4TE,autom4te,:)
 

rpm/trunk/tests/Makefile.am

@@ -7 +7 @@
 
 # HACK: This should not be here.
+if BUILD_OS_IS_OS2
+rpmbindir = $(bindir)
+else
 rpmbindir = `echo $(bindir) | sed -e s,usr/bin,bin,`
+endif
 
 ##