Merge Harald Böhme's solaris patches

[strace] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index c1ddde26a024388e825bbf8195d321cbc771701c..15f87fc64dd6070f4566a5b2499b778d018e77ba 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,54 +3,58 @@
 # $Id$
 #
 
-srcdir = @srcdir@
-VPATH = @srcdir@
+srcdir         = @srcdir@
+VPATH          = @srcdir@
 
-CC = @CC@
+CC             = @CC@
 
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
+INSTALL                = @INSTALL@
+INSTALL_PROGRAM        = @INSTALL_PROGRAM@
+INSTALL_DATA   = @INSTALL_DATA@
 
-DEFS = @DEFS@
-LDLIBS = @LIBS@
+DEFS           = @DEFS@
+LDLIBS         = @LIBS@
 
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-WARNFLAGS = @WARNFLAGS@
+CFLAGS         = @CFLAGS@
+CPPFLAGS       = @CPPFLAGS@
+LDFLAGS                = @LDFLAGS@
+WARNFLAGS      = @WARNFLAGS@
 
-# OS is one of `linux', `sunos4', or `svr4'.
-OS = @opsys@
-# ARCH is one of `i386', `m68k', `sparc', or `mips'.
-ARCH = @arch@
+# OS is one of `linux', `sunos4', `svr4', or `freebsd'.
+OS             = @opsys@
+# ARCH is one of `i386', `m68k', `sparc', `arm', `mips' or `ia64'.
+ARCH           = @arch@
 # OSARCH is OS/ARCH if it exists, otherwise just OS.
-OSARCH = @osarch@
+OSARCH         = @osarch@
 
 # You may define any of MAX_PROCS, DEFAULT_STRLEN, DEFAULT_ACOLUMN,
 # or DEFAULT_SORTBY here.
-EXTRA_DEFS =
+EXTRA_DEFS     =
 
 # Where include files are located, useful for cross-compiling.
-includedir = @includedir@
+includedir     = @includedir@
 
 # Where to install the program:
 # I recommend `/usr' for Linux, `/usr/local' for the others.
-prefix = @prefix@
-exec_prefix = @exec_prefix@
+prefix         = @prefix@
+exec_prefix    = @exec_prefix@
 
-bindir = $(exec_prefix)/bin
-man1dir = $(prefix)/man/man1
+bindir         = @bindir@
+mandir         = @mandir@
+man1dir                = $(mandir)/man1
 man1ext = .1
 
-SHELL = /bin/sh
+SHELL          = /bin/sh
 
-INCLUDES = -I. -I$(OS)/$(ARCH) -I$(srcdir)/$(OS)/$(ARCH) -I$(OS) -I$(srcdir)/$(OS)
-SUBDIRS = $(OSARCH)
-ALL_SUBDIRS = test linux linux/alpha linux/powerpc sunos4 svr4
-OBJ = strace.o version.o syscall.o util.o \
-       desc.o file.o ipc.o io.o ioctl.o mem.o net.o process.o bjm.o \
-       resource.o signal.o sock.o system.o term.o time.o proc.o stream.o
+INCLUDES       = -I. -I$(OS)/$(ARCH) -I$(srcdir)/$(OS)/$(ARCH) -I$(OS) \
+                       -I$(srcdir)/$(OS)
+SUBDIRS                = $(OSARCH)
+
+ALL_SUBDIRS    = test linux linux/alpha linux/powerpc sunos4 svr4 freebsd/i386
+OBJ            = strace.o version.o syscall.o util.o desc.o file.o ipc.o \
+                       io.o ioctl.o mem.o net.o process.o bjm.o \
+                       resource.o signal.o sock.o system.o term.o time.o \
+                       proc.o stream.o
 
 all: strace
 
@@ -59,7 +63,7 @@ strace: $(OBJ)
 
 install: all
        $(INSTALL_PROGRAM) strace $(bindir)/strace
-       $(INSTALL_PROGRAM) strace-graph $(bindir)/strace-graph
+       $(INSTALL_PROGRAM) $(srcdir)/strace-graph $(bindir)/strace-graph
        $(INSTALL_DATA) $(srcdir)/strace.1 $(man1dir)/strace$(man1ext)
 
 clean: clean-local