Changeset 5e7ae8 in git

Timestamp:

Jul 21, 2010, 3:32:25 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

27667b70a3500461f900cc74ee65d7acbdf8ca5c

Parents:

0c0e4f2bde3eb28182fbcccca643deb68e4531e3

Message:

fix includes and path names

git-svn-id: file:///usr/local/Singular/svn/trunk@13039 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

dyn_modules

Files:

• loctriv.mod (modified) (1 diff)
• modgen/makefile.cc (modified) (1 diff)
• modgen/misc.cc (modified) (1 diff)

dyn_modules/loctriv.mod

@@ -8 +8 @@
  *
  */
-#include "ideals.h"
-#include "ring.h"
-#include "kstd1.h"
-#include "prCopy.h"
+#include <kernel/ideals.h>
+#include <kernel/ring.h>
+#include <kernel/kstd1.h>
+#include <kernel/prCopy.h>
 %}
 

dyn_modules/modgen/makefile.cc

@@ -92 +92 @@
   fprintf(fp, "SINGUNAME\t= %s\n",SINGUNAME);
 #warning "PROBLEM: nice place for include file has to be found"
-  fprintf(fp, "CFLAGS\t= -DNDEBUG -DBUILD_MODULE -I. -I${SINGULARROOT}/kernel -I${SINGULARROOT}/Singular -I${SINGULARROOT}/${SINGUNAME}/include\n");
-  fprintf(fp, "DCFLAGS\t= -DBUILD_MODULE -I. -I${SINGULARROOT}/kernel -I${SINGULARROOT}/Singular -I${SINGULARROOT}/${SINGUNAME}/include\n");
+  fprintf(fp, "CFLAGS\t= -DNDEBUG -DBUILD_MODULE -I. -I${SINGULARROOT} -I${SINGULARROOT}/${SINGUNAME}/include\n");
+  fprintf(fp, "DCFLAGS\t= -DBUILD_MODULE -I. -I${SINGULARROOT} -I${SINGULARROOT}/${SINGUNAME}/include\n");
   fprintf(fp, "#LD\t=\n");
   fprintf(fp, "\n");
   fprintf(fp, "instdir          = %s\n", inst_dir );
-  fprintf(fp, "MKINSTALLDIRS\t\t= ${SINGULARROOT}/modules/mkinstalldirs\n");
+  fprintf(fp, "MKINSTALLDIRS\t\t= ${SINGULARROOT}/dyn_modules/mkinstalldirs\n");
 #warning "PROBLEM: do we also install install-sh when installing Singular?"
   fprintf(fp, "INSTALL\t\t= ${SINGULARROOT}/Singular/install-sh -c\n");

dyn_modules/modgen/misc.cc

@@ -546 +546 @@
     fprintf(fp, "#include <sys/stat.h>");
     fprintf(fp, "\n");
-    fprintf(fp, "#include <mod2.h>\n");
-    fprintf(fp, "#include <tok.h>\n");
-    fprintf(fp, "#include <structs.h>\n");
-    fprintf(fp, "#include <ipid.h>\n\n");
-    fprintf(fp, "#include <locals.h>\n");
+    fprintf(fp, "#include <Singular/mod2.h>\n");
+    fprintf(fp, "#include <Singular/tok.h>\n");
+    fprintf(fp, "#include <kernel/structs.h>\n");
+    fprintf(fp, "#include <Singular/ipid.h>\n\n");
+    fprintf(fp, "#include <Singular/locals.h>\n");
     fprintf(fp, "#include <omalloc.h>\n");
     fprintf(fp, "#include \"%s.h\"\n", module);