move arch-independent file to share

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@200 b08c6af1-5177-4d33-ba66-4b1c6b8b522a

C/sysbits.c

@@ -20,7 +20,7 @@ static char SccsId[] = "%W% %G%";
 
 /*
  * In this routine we shall try to include the inevitably machine dependant
- * routines. These include, for the moment : Time, A rudimentar form of
+ * routines. These include, for the moment : Time, A rudimentary form of
  * signal handling, OS calls,
  *
  * Vitor Santos Costa, February 1987
@@ -142,7 +142,7 @@ dir_separator (int ch)
 
 void
 InitSysPath(void) {
-  strncpy(FileNameBuf, LIB_DIR, YAP_FILENAME_MAX);
+  strncpy(FileNameBuf, SHARE_DIR, YAP_FILENAME_MAX);
 #ifdef MAC
   strncat(FileNameBuf,":", YAP_FILENAME_MAX);
 #elif ATARI || _MSC_VER || defined(__MINGW32__)
@@ -150,7 +150,7 @@ InitSysPath(void) {
 #else
   strncat(FileNameBuf,"/", YAP_FILENAME_MAX);
 #endif
-  strncat(FileNameBuf, "library", YAP_FILENAME_MAX);
+  strncat(FileNameBuf, "Yap", YAP_FILENAME_MAX);
   PutValue(LookupAtom("system_library_directory"),
 	   MkAtomTerm(LookupAtom(FileNameBuf)));
 }

CHR/Makefile.in

@@ -7,9 +7,9 @@ ROOTDIR = @prefix@
 #
 BINDIR = $(ROOTDIR)/bin
 #
-# where YAP should look for libraries
+# where YAP should look for architecture-independent Prolog libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+SHAREDIR=$(ROOTDIR)/share/Yap
 #
 #
 # You shouldn't need to change what follows.
@@ -85,12 +85,8 @@ CHR_EXAMPLES= $(srcdir)/chr/examples/allentable.pl \
 
 
 install: $(CHR_TOP) $(CHR_LICENSE) $(CHR_PROGRAMS) $(CHR_EXAMPLES)
-	-mkdir -p $(DESTDIR)$(LIBDIR)/library
+	mkdir -p $(DESTDIR)$(SHAREDIR)/chr/examples
-	-mkdir -p $(DESTDIR)$(LIBDIR)/library/chr
+	for h in $(CHR_TOP); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR); done
-	-mkdir -p $(DESTDIR)$(LIBDIR)/library/chr/examples
+	for h in $(CHR_LICENSE); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR); done
-	for h in $(CHR_TOP); do $(INSTALL_DATA) $$h $(DESTDIR)$(LIBDIR)/library; done
+	for h in $(CHR_PROGRAMS); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR)/chr; done
-	for h in $(CHR_LICENSE); do $(INSTALL_DATA) $$h $(DESTDIR)$(LIBDIR)/library; done
+	for h in $(CHR_EXAMPLES); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR)/chr/examples; done
-	for h in $(CHR_PROGRAMS); do $(INSTALL_DATA) $$h $(DESTDIR)$(LIBDIR)/library/chr; done
-	for h in $(CHR_EXAMPLES); do $(INSTALL_DATA) $$h $(DESTDIR)$(LIBDIR)/library/chr/examples; done
-
-

CLPQR/Makefile.in

@@ -11,6 +11,10 @@ BINDIR = $(ROOTDIR)/bin
 #
 LIBDIR=$(ROOTDIR)/lib/Yap
 #
+# where YAP should look for architecture-independent Prolog libraries
+#
+SHAREDIR=$(ROOTDIR)/share/Yap
+#
 #
 # You shouldn't need to change what follows.
 #
@@ -129,22 +133,21 @@ CLPQR_EXAMPLES_SESSION= $(srcdir)/clpqr/examples/SESSION/010 \
 
 install: $(CLPR_TOP) $(CLPQ_TOP) $(CLPQR_LICENSE) $(CLPQR_PROGRAMS) $(CLPQR_LOCAL)\
 	$(CLPQR_EXAMPLES) $(CLPQR_EXAMPLES_MONASH) $(CLPQR_EXAMPLES_SESSION)
-	-mkdir -p $(DESTDIR)$(LIBDIR)/library
+	mkdir -p $(DESTDIR)$(SHAREDIR)/clpq
-	-mkdir -p $(DESTDIR)$(LIBDIR)/library/clpq
+	mkdir -p $(DESTDIR)$(SHAREDIR)/clpqr
-	-mkdir -p $(DESTDIR)$(LIBDIR)/library/clpqr
+	mkdir -p $(DESTDIR)$(SHAREDIR)/clpr
-	-mkdir -p $(DESTDIR)$(LIBDIR)/library/clpr
+	mkdir -p $(DESTDIR)$(SHAREDIR)/clpqr/examples
-	-mkdir -p $(DESTDIR)$(LIBDIR)/library/clpqr/examples
+	mkdir -p $(DESTDIR)$(SHAREDIR)/clpqr/examples/SESSION
-	-mkdir -p $(DESTDIR)$(LIBDIR)/library/clpqr/examples/SESSION
+	mkdir -p $(DESTDIR)$(SHAREDIR)/clpqr/examples/monash
-	-mkdir -p $(DESTDIR)$(LIBDIR)/library/clpqr/examples/monash
+	for h in $(CLPQ_TOP); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR); done
-	for h in $(CLPQ_TOP); do $(INSTALL_DATA) $$h $(DESTDIR)$(LIBDIR)/library; done
+	for h in $(CLPR_TOP); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR); done
-	for h in $(CLPR_TOP); do $(INSTALL_DATA) $$h $(DESTDIR)$(LIBDIR)/library; done
+	for h in $(CLPQR_LICENSE); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR); done
-	for h in $(CLPQR_LICENSE); do $(INSTALL_DATA) $$h $(DESTDIR)$(LIBDIR)/library; done
+	for h in $(CLPQR_PROGRAMS); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR)/clpqr; done
-	for h in $(CLPQR_PROGRAMS); do $(INSTALL_DATA) $$h $(DESTDIR)$(LIBDIR)/library/clpqr; done
+	for h in $(CLPQ_PROGRAMS); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR)/clpq; done
-	for h in $(CLPQ_PROGRAMS); do $(INSTALL_DATA) $$h $(DESTDIR)$(LIBDIR)/library/clpq; done
+	for h in $(CLPR_PROGRAMS); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR)/clpr; done
-	for h in $(CLPR_PROGRAMS); do $(INSTALL_DATA) $$h $(DESTDIR)$(LIBDIR)/library/clpr; done
+	for h in $(CLPQR_LOCAL); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR)/clpqr; done
-	for h in $(CLPQR_LOCAL); do $(INSTALL_DATA) $$h $(DESTDIR)$(LIBDIR)/library/clpqr; done
+	for h in $(CLPQR_EXAMPLES); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR)/clpqr/examples; done
-	for h in $(CLPQR_EXAMPLES); do $(INSTALL_DATA) $$h $(DESTDIR)$(LIBDIR)/library/clpqr/examples; done
+	for h in $(CLPQR_EXAMPLES_MONASH); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR)/clpqr/examples/monash; done
-	for h in $(CLPQR_EXAMPLES_MONASH); do $(INSTALL_DATA) $$h $(DESTDIR)$(LIBDIR)/library/clpqr/examples/monash; done
+	for h in $(CLPQR_EXAMPLES_SESSION); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR)/clpqr/examples/SESSION; done
-	for h in $(CLPQR_EXAMPLES_SESSION); do $(INSTALL_DATA) $$h $(DESTDIR)$(LIBDIR)/library/clpqr/examples/SESSION; done
 
 

Makefile.in

@@ -1,16 +1,22 @@
 #
 # default base directory for YAP installation
+# (EROOT for architecture-dependent files)
 #
 ROOTDIR = @prefix@
+EROOTDIR = @exec_prefix@
 #
 # where the binary should be
 #
-BINDIR = $(ROOTDIR)/bin
+BINDIR = $(EROOTDIR)/bin
 #
-# where YAP should look for libraries
+# where YAP should look for binary libraries
 #
-LIBDIR=$(ROOTDIR)/lib
+LIBDIR=$(EROOTDIR)/lib
-YAPLIBDIR=$(ROOTDIR)/lib/Yap
+YAPLIBDIR=$(EROOTDIR)/lib/Yap
+#
+# where YAP should look for architecture-independent Prolog libraries
+#
+SHAREDIR=$(ROOTDIR)/share
 #
 # where the includes should be stored
 #
@@ -52,6 +58,10 @@ CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
 C_INTERF_FLAGS= @C_INTERF_FLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS) -I$(srcdir)/include
 C_PARSER_FLAGS= @C_PARSER_FLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
 #
+# where YAP should look for architecture-independent Prolog libraries
+#
+SHAREDIR=$(ROOTDIR)/share/Yap
+#
 #
 # You shouldn't need to change what follows.
 #
@@ -364,7 +374,7 @@ stdpreds.o: $(srcdir)/C/stdpreds.c
 	$(CC) -c $(CFLAGS) $(srcdir)/C/stdpreds.c -o $@
 
 sysbits.o: $(srcdir)/C/sysbits.c
-	$(CC) -c $(CFLAGS) -DLIB_DIR=\"$(YAPLIBDIR)\" $(srcdir)/C/sysbits.c -o $@
+	$(CC) -c $(CFLAGS) -DLIB_DIR=\"$(LIBDIR)\" -DSHARE_DIR=\"$(SHAREDIR)\" $(srcdir)/C/sysbits.c -o $@
 
 tracer.o: $(srcdir)/C/tracer.c
 	$(CC) -c $(CFLAGS) $(srcdir)/C/tracer.c -o $@
@@ -451,52 +461,50 @@ libYap.a: $(LIB_OBJECTS)
 	$(AR) rc libYap.a $(LIB_OBJECTS)
 	$(RANLIB) libYap.a
 
-install: @INSTALL_COMMAND@
+install: install_bin install_data
+
+install_bin: @INSTALL_COMMAND@
 
 install_unix: startup
-	-mkdir -p $(DESTDIR)$(BINDIR)
+	mkdir -p $(DESTDIR)$(BINDIR)
 	$(INSTALL_PROGRAM) -m 755 yap $(DESTDIR)$(BINDIR)/yap
-	-mkdir -p $(DESTDIR)$(YAPLIBDIR)
+	mkdir -p $(DESTDIR)$(YAPLIBDIR)
-	$(INSTALL_DATA) -m 644 startup $(DESTDIR)$(YAPLIBDIR)/startup
+	$(INSTALL_DATA) startup $(DESTDIR)$(YAPLIBDIR)/startup
-	$(INSTALL_DATA) -m 644 libYap.a  $(DESTDIR)$(LIBDIR)/libYap.a
+	$(INSTALL_DATA) libYap.a  $(DESTDIR)$(LIBDIR)/libYap.a
-	(cd library ; make install)
-	$(INSTALL_DATA) $(srcdir)/LGPL/pillow/icon_address.pl $(DESTDIR)$(YAPLIBDIR)/library
-	$(INSTALL_DATA) $(srcdir)/LGPL/pillow/pillow.pl $(DESTDIR)$(YAPLIBDIR)/library
-	-(cd CLPQR ; make install)
-	-(cd CHR ; make install)
 	@INSTALL_DLLS@ (cd library/regex; make install)
 	@INSTALL_DLLS@ (cd library/system; make install)
 	@INSTALL_DLLS@ (cd library/random; make install)
-	-mkdir -p $(DESTDIR)$(INCLUDEDIR)
+	mkdir -p $(DESTDIR)$(INCLUDEDIR)
 	for h in $(INTERFACE_HEADERS); do $(INSTALL) $$h $(DESTDIR)$(INCLUDEDIR); done
 
 install_mingw32: startup
-	-mkdir -p $(DESTDIR)$(ROOTDIR)
+	mkdir -p $(DESTDIR)$(BINDIR)
-	-mkdir -p $(DESTDIR)$(BINDIR)
+	mkdir -p $(DESTDIR)$(LIBDIR)
-	-mkdir -p $(DESTDIR)$(ROOTDIR)/lib
+	mkdir -p $(DESTDIR)$(YAPLIBDIR)
-	-mkdir -p $(DESTDIR)$(YAPLIBDIR)
+	mkdir -p $(DESTDIR)$(INCLUDEDIR)
-	-mkdir -p $(DESTDIR)$(ROOTDIR)/include
-	-mkdir -p $(DESTDIR)$(INCLUDEDIR)
 	$(INSTALL_PROGRAM) -m 755 yap.exe $(DESTDIR)$(BINDIR)/yap.exe
 	$(INSTALL_PROGRAM) -m 755 yap.dll $(DESTDIR)$(BINDIR)/yap.dll
 	$(INSTALL_PROGRAM) -m 755 startup $(DESTDIR)$(YAPLIBDIR)/startup
 	$(INSTALL) $(HEADERS) $(DESTDIR)$(INCLUDEDIR)
 	$(INSTALL) $(srcdir)/include/c_interface.h $(DESTDIR)$(INCLUDEDIR)/c_interface.h
 	$(INSTALL) config.h $(INCLUDEDIR)/config.h
-	(cd library ; make install)
-	$(INSTALL_DATA) $(srcdir)/LGPL/pillow/icon_address.pl $(DESTDIR)$(YAPLIBDIR)/library
-	$(INSTALL_DATA) $(srcdir)/LGPL/pillow/pillow.pl $(DESTDIR)$(YAPLIBDIR)/library
-	(cd CLPQR ; make install)
-	(cd CHR ; make install)
 	(cd library/regex; make install_mingw32)
 	(cd library/system; make install_mingw32)
 	(cd library/random; make install_mingw32)
 
 install_library: libYap.a
-	$(INSTALL_DATA) -m 644 libYap.a  $(DESTDIR)$(LIBDIR)/libYap.a
+	$(INSTALL_DATA) libYap.a  $(DESTDIR)$(LIBDIR)/libYap.a
-	-mkdir -p $(DESTDIR)$(INCLUDEDIR)
+	mkdir -p $(DESTDIR)$(INCLUDEDIR)
 	for h in $(HEADERS); do $(INSTALL) $$h $(DESTDIR)$(INCLUDEDIR); done
 
+install_data:
+	(cd library ; make install)
+	$(INSTALL_DATA) $(srcdir)/LGPL/pillow/icon_address.pl $(DESTDIR)$(SHAREDIR)/Yap
+	$(INSTALL_DATA) $(srcdir)/LGPL/pillow/pillow.pl $(DESTDIR)$(SHAREDIR)/Yap
+	(cd CLPQR ; make install)
+	(cd CHR ; make install)
+
+
 ##########
 TAGS: $(C_SOURCES) $(PL_SOURCES) $(HEADERS)
 	etags  $(C_SOURCES)  $(PL_SOURCES) $(HEADERS)

library/Makefile.in

@@ -7,10 +7,14 @@ ROOTDIR = @prefix@
 #
 BINDIR = $(ROOTDIR)/bin
 #
-# where YAP should look for libraries
+# where YAP should look for binary libraries
 #
 LIBDIR=$(ROOTDIR)/lib/Yap
 #
+# where YAP should look for architecture-independent Prolog libraries
+#
+SHAREDIR=$(ROOTDIR)/share
+#
 #
 # You shouldn't need to change what follows.
 #
@@ -43,6 +47,6 @@ LOGTALK_PROGRAMS= \
 	$(srcdir)/logtalk/yap430.config
 
 install: $(PROGRAMS)
-	-mkdir -p $(DESTDIR)$(LIBDIR)/library/logtalk
+	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap
-	for p in $(PROGRAMS); do $(INSTALL) $$p $(DESTDIR)$(LIBDIR)/library; done
+	for p in $(PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/Yap; done
-	for p in $(LOGTALK_PROGRAMS); do $(INSTALL) $$p $(DESTDIR)$(LIBDIR)/library/logtalk; done
+	for p in $(LOGTALK_PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/Yap/logtalk; done

library/random/Makefile.in

@@ -1,15 +1,17 @@
 #
 # default base directory for YAP installation
+# (EROOT for architecture-dependent files)
 #
 ROOTDIR = @prefix@
+EROOTDIR = @exec_prefix@
 #
 # where the binary should be
 #
-BINDIR = $(ROOTDIR)/bin
+BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=$(EROOTDIR)/lib/Yap
 #
 #
 CC=@CC@

library/regex/Makefile.in

@@ -1,15 +1,17 @@
 #
 # default base directory for YAP installation
+# (EROOT for architecture-dependent files)
 #
 ROOTDIR = @prefix@
+EROOTDIR = @exec_prefix@
 #
 # where the binary should be
 #
-BINDIR = $(ROOTDIR)/bin
+BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=$(EROOTDIR)/lib/Yap
 #
 #
 CC=@CC@

library/system/Makefile.in

@@ -1,15 +1,17 @@
 #
 # default base directory for YAP installation
+# (EROOT for architecture-dependent files)
 #
 ROOTDIR = @prefix@
+EROOTDIR = @exec_prefix@
 #
 # where the binary should be
 #
-BINDIR = $(ROOTDIR)/bin
+BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=$(EROOTDIR)/lib/Yap
 #
 #
 CC=@CC@