diff --git a/alliance/src/abl/src/Makefile.am b/alliance/src/abl/src/Makefile.am index 56a3cef1..ec80ce31 100644 --- a/alliance/src/abl/src/Makefile.am +++ b/alliance/src/abl/src/Makefile.am @@ -1,5 +1,5 @@ -INCLUDES = -I$(top_srcdir)/../mbk/src \ - -I$(top_srcdir)/../aut/src +CFLAGS = @CFLAGS@ \ + -DALLIANCE_TOP=\"${ALLIANCE_TOP}\" lib_LIBRARIES = libAbl.a include_HEADERS = abl.h libAbl_a_SOURCES = abldel.h ablflat.h abloptim.h ablunflat.h \ diff --git a/alliance/src/aut/src/Makefile.am b/alliance/src/aut/src/Makefile.am index 233fcfc6..3079c3f6 100644 --- a/alliance/src/aut/src/Makefile.am +++ b/alliance/src/aut/src/Makefile.am @@ -1,4 +1,5 @@ -INCLUDES = -I$(top_srcdir)/../mbk/src +CFLAGS = @CFLAGS@ \ + -DALLIANCE_TOP=\"${ALLIANCE_TOP}\" lib_LIBRARIES = libAut.a include_HEADERS = aut.h libAut_a_SOURCES = autenv.h autfree.h authash2.h autsort.h \ diff --git a/alliance/src/configure.in b/alliance/src/configure.in index babeb1be..21c954d4 100644 --- a/alliance/src/configure.in +++ b/alliance/src/configure.in @@ -25,7 +25,7 @@ dnl Almost ten years since I wrote this stuff, I just can't dnl believe it dnl Date : 01/02/2002 dnl Author : Frederic Petrot -dnl $Id: configure.in,v 1.2 2002/03/15 16:17:13 fred Exp $ +dnl $Id: configure.in,v 1.3 2002/03/18 11:13:59 ludo Exp $ dnl dnl AC_INIT(./mbk) @@ -38,7 +38,7 @@ changequote(,)dnl # compiled and installed prior to the tools # Add in the following variable the library name (or part of it, as a # match is performed) that you what to compile prior to anything -libraries="\ /dev/null \ diff --git a/alliance/src/rds/man3/Makefile.in b/alliance/src/rds/man3/Makefile.in index 0dde3e1b..d1fa2ef8 100644 --- a/alliance/src/rds/man3/Makefile.in +++ b/alliance/src/rds/man3/Makefile.in @@ -60,7 +60,10 @@ POST_UNINSTALL = : CC = @CC@ INCLUDES = @INCLUDES@ LDFLAGS = @LDFLAGS@ +MAKEINFO = @MAKEINFO@ +PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +VERSION = @VERSION@ man_MANS = addrdsfig.3 addrdsfigrec.3 addrdsins.3 addrdsinsrec.3 addrdsrecwindow.3 allocrdsfig.3 allocrdsins.3 allocrdsrec.3 allocrdsrecwin.3 allocrdswin.3 allocrdswindow.3 allocrdswinrec.3 buildrdswindow.3 conmbkrds.3 delrdsfig.3 delrdsfigrec.3 delrdsins.3 delrdsinsrec.3 delrdsrecwindow.3 destroyrdswindow.3 figmbkrds.3 freerdsfig.3 freerdsins.3 freerdsrec.3 getrdsmodellist.3 insconmbkrds.3 insmbkrds.3 insrefmbkrds.3 inssegmbkrds.3 instanceface.3 insviambkrds.3 loadrdsfig.3 loadrdsparam.3 modelmbkrds.3 rdsalloc.3 rdsenv.3 rdsfree.3 refmbkrds.3 roundrdsrec.3 saverdsfig.3 searchrdsfig.3 segmbkrds.3 viambkrds.3 viewrdsfig.3 viewrdsins.3 viewrdsparam.3 viewrdsrec.3 viewrdswindow.3 viewrfmcon.3 viewrfmfig.3 viewrfmins.3 viewrfmrec.3 viewrfmref.3 viewrfmseg.3 viewrfmvia.3 @@ -73,9 +76,6 @@ NROFF = nroff DIST_COMMON = Makefile.am Makefile.in -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = gtar @@ -145,7 +145,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff --git a/alliance/src/rds/src/Makefile.in b/alliance/src/rds/src/Makefile.in index 5fdeb0d1..43e216d1 100644 --- a/alliance/src/rds/src/Makefile.in +++ b/alliance/src/rds/src/Makefile.in @@ -60,7 +60,10 @@ POST_UNINSTALL = : CC = @CC@ INCLUDES = @INCLUDES@ LDFLAGS = @LDFLAGS@ +MAKEINFO = @MAKEINFO@ +PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +VERSION = @VERSION@ lib_LIBRARIES = libRds.a libRut.a libRfm.a libRpr.a libRwi.a libRtl.a @@ -107,9 +110,6 @@ HEADERS = $(include_HEADERS) DIST_COMMON = Makefile.am Makefile.in -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = gtar @@ -271,7 +271,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \