- ginsh now includes "ginac.h" when compiled as part of the GiNaC package,

  and <ginac/ginac.h> otherwise

diff --git a/Makefile.in b/Makefile.in
index a61a6e7495e6e5f76a74d1052e2b8224c9a790d6..ae1dd8dbfd5264be57f6e36ec686cd1b88174568 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -359,7 +359,7 @@ distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \

-           cp -pr $$d/$$file $(distdir)/$$file; \
+           cp -pr $$/$$file $(distdir)/$$file; \

          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \

diff --git a/check/Makefile.in b/check/Makefile.in
index ce230456212fb2892190afaeac84ad1949ee233f..01810c8e4a56e0c4525b3e91e7cf07064013a069 100644 (file)
--- a/check/Makefile.in
+++ b/check/Makefile.in
@@ -254,7 +254,7 @@ distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \

-           cp -pr $$d/$$file $(distdir)/$$file; \
+           cp -pr $$/$$file $(distdir)/$$file; \

          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \

diff --git a/cint/Makefile.in b/cint/Makefile.in
index 9a43c9acb1e60e3f15822c16296823314ffbf889..00851a0a60fed183111935b70ad6faddaa11f1c5 100644 (file)
--- a/cint/Makefile.in
+++ b/cint/Makefile.in
@@ -341,7 +341,7 @@ distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \

-           cp -pr $$d/$$file $(distdir)/$$file; \
+           cp -pr $$/$$file $(distdir)/$$file; \

          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 6fa6eccbcc4d065f8c97e0f9c5206e1e1880f028..7b5a3f9ba43b455965578f58d737d9e4e46168cd 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -274,7 +274,7 @@ distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \

-           cp -pr $$d/$$file $(distdir)/$$file; \
+           cp -pr $$/$$file $(distdir)/$$file; \

          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \

diff --git a/doc/reference/Makefile.in b/doc/reference/Makefile.in
index d9e8155508af5860ce0d00719639176899481bb2..53ca7fa109524e4705bce3fb924ac61828abdc42 100644 (file)
--- a/doc/reference/Makefile.in
+++ b/doc/reference/Makefile.in
@@ -170,7 +170,7 @@ distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \

-           cp -pr $$d/$$file $(distdir)/$$file; \
+           cp -pr $$/$$file $(distdir)/$$file; \

          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \

diff --git a/doc/tutorial/Makefile.in b/doc/tutorial/Makefile.in
index 16fc4f9397a62c9624d8a795c7f010feffccc64a..158a13357a427495675746059882f346a7b7ff70 100644 (file)
--- a/doc/tutorial/Makefile.in
+++ b/doc/tutorial/Makefile.in
@@ -327,7 +327,7 @@ distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \

-           cp -pr $$d/$$file $(distdir)/$$file; \
+           cp -pr $$/$$file $(distdir)/$$file; \

          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \

diff --git a/ginac/Makefile.in b/ginac/Makefile.in
index e9eff67cb3e3005ef1a414b6cad7fc081d3ae668..596304e25ca74925939334a9dd863193019c3772 100644 (file)
--- a/ginac/Makefile.in
+++ b/ginac/Makefile.in
@@ -295,7 +295,7 @@ distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \

-           cp -pr $$d/$$file $(distdir)/$$file; \
+           cp -pr $$/$$file $(distdir)/$$file; \

          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \

diff --git a/ginsh/Makefile.am b/ginsh/Makefile.am
index 0c3479b043b5fc46216b49593beeee3bd065130e..d16cd4d3e31e4ca6baf735b12e23b1aec6044788 100644 (file)
--- a/ginsh/Makefile.am
+++ b/ginsh/Makefile.am
@@ -3,6 +3,7 @@
 bin_PROGRAMS = ginsh
 ginsh_SOURCES = ginsh_parser.yy ginsh_lexer.ll ginsh.h
 ginsh_LDADD = ../ginac/libginac.la $(GINSH_LIBS)
 bin_PROGRAMS = ginsh
 ginsh_SOURCES = ginsh_parser.yy ginsh_lexer.ll ginsh.h
 ginsh_LDADD = ../ginac/libginac.la $(GINSH_LIBS)

+CPPFLAGS = -DIN_GINAC

 INCLUDES = -I$(srcdir)/../ginac
 man_MANS = ginsh.1
 YFLAGS = -d
 INCLUDES = -I$(srcdir)/../ginac
 man_MANS = ginsh.1
 YFLAGS = -d

diff --git a/ginsh/Makefile.in b/ginsh/Makefile.in
index 4611377e5833c4a44a76bd73a89282ababe06b62..b33a865b737867fbe7f61d52954d11ea515ad2c5 100644 (file)
--- a/ginsh/Makefile.in
+++ b/ginsh/Makefile.in
@@ -107,6 +107,7 @@ YACC = @YACC@
 bin_PROGRAMS = ginsh
 ginsh_SOURCES = ginsh_parser.yy ginsh_lexer.ll ginsh.h
 ginsh_LDADD = ../ginac/libginac.la $(GINSH_LIBS)
 bin_PROGRAMS = ginsh
 ginsh_SOURCES = ginsh_parser.yy ginsh_lexer.ll ginsh.h
 ginsh_LDADD = ../ginac/libginac.la $(GINSH_LIBS)

+CPPFLAGS = -DIN_GINAC

 INCLUDES = -I$(srcdir)/../ginac
 man_MANS = ginsh.1
 YFLAGS = -d
 INCLUDES = -I$(srcdir)/../ginac
 man_MANS = ginsh.1
 YFLAGS = -d


@@ -118,7 +119,6 @@ PROGRAMS =  $(bin_PROGRAMS)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) -I..
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) -I..

-CPPFLAGS = @CPPFLAGS@

 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 ginsh_OBJECTS =  ginsh_parser.o ginsh_lexer.o
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 ginsh_OBJECTS =  ginsh_parser.o ginsh_lexer.o


@@ -317,7 +317,7 @@ distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \

-           cp -pr $$d/$$file $(distdir)/$$file; \
+           cp -pr $$/$$file $(distdir)/$$file; \

          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \

diff --git a/ginsh/ginsh.h b/ginsh/ginsh.h
index e4bb52dc757f0e13020b7296adea79f7393aff9e..3cab831970c87a20419e0b615bede59386c38f35 100644 (file)
--- a/ginsh/ginsh.h
+++ b/ginsh/ginsh.h
@@ -41,7 +41,11 @@ extern "C" {
 }
 #endif
 
 }
 #endif
 

+#ifdef IN_GINAC

 #include "ginac.h"
 #include "ginac.h"

+#else
+#include <ginac/ginac.h>
+#endif

 
 #ifndef NO_NAMESPACE_GINAC
 using namespace GiNaC;
 
 #ifndef NO_NAMESPACE_GINAC
 using namespace GiNaC;

diff --git a/tools/Makefile.in b/tools/Makefile.in
index a0a6800239f772dd609bccedf213d3df81fa64fe..0033fd6d4f9416304647dd3708d1ce5280eeb02f 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -300,7 +300,7 @@ distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \

-           cp -pr $$d/$$file $(distdir)/$$file; \
+           cp -pr $$/$$file $(distdir)/$$file; \

          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \