Permalink
Browse files

Better support for alternative tool names.

  • Loading branch information...
megastep committed Jul 25, 2008
1 parent afdfcea commit aa6ac52e320bb53ea5c4db5638e7aa808641b1ab
Showing with 11 additions and 6 deletions.
  1. +2 −1 Makefile.in
  2. +2 −0 configure.in
  3. +3 −2 dialog/Makefile.in
  4. +4 −3 plugins/Makefile.in
View
@@ -4,7 +4,7 @@ PACKAGE = setup-$(SETUP_VERSION)
DATADIR = .
LOCALEDIR = locale
-@SET_MAKE@
+# @SET_MAKE@
arch := @ARCH@
libc := @LIBC@
os := @OS@
@@ -15,6 +15,7 @@ UNINSTALL_VERSION = 1.0.4
CC = @CC@
CXX = @CXX@
+AR = @AR@
# This indicates where the 'setupdb' CVS module is checked out
SETUPDB = @SETUPDB@
View
@@ -21,6 +21,8 @@ AC_PROG_RANLIB
AC_PROG_MAKE_SET
AC_PROG_INSTALL
+AC_PATH_PROGS(AR, [ar gar])
+
AC_PATH_XTRA
AC_CHECK_HEADERS(unistd.h)
AC_CHECK_HEADERS(strings.h)
View
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.5 2002-12-07 00:57:32 megastep Exp $
+# $Id: Makefile.in,v 1.6 2008-07-25 22:56:53 megastep Exp $
# template makefile for DIALOG
#
SHELL = /bin/sh
@@ -11,6 +11,7 @@ CC = @CC@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
RANLIB = @RANLIB@
+AR = @AR@
RM = rm -f
LINT = lint
@@ -51,7 +52,7 @@ all :: $(ALL)
dialog.o $(OBJS) : dialog.h
$(LIB) : $(OBJS)
- ar crv $(LIB) $(OBJS)
+ $(AR) crv $(LIB) $(OBJS)
$(RANLIB) $@
clean:
View
@@ -1,13 +1,14 @@
#
# Makefile for the setup plugins
-# $Id: Makefile.in,v 1.6 2002-12-07 00:57:32 megastep Exp $
+# $Id: Makefile.in,v 1.7 2008-07-25 22:56:53 megastep Exp $
#
@SET_MAKE@
STATICS = cpio.c
PLUGINS = @PLUGINS@
CFLAGS = -fPIC @CFLAGS@ -I..
-CC = @CC@
+CC = @CC@
+AR = @AR@
DYN_PLUGINS = @DYN_PLUGINS@
arch := @ARCH@
@@ -51,7 +52,7 @@ install.dbg:
endif
libplugins.a: $(OBJS)
- ar rcs libplugins.a $(OBJS)
+ $(AR) rcs libplugins.a $(OBJS)
.c.so:
$(CC) -shared -o $@ $*.c $(CFLAGS)

0 comments on commit aa6ac52

Please sign in to comment.