*** mk.stdx.orig Fri Jan 13 07:14:12 1995 --- mk.stdx Tue Dec 7 21:33:21 1999 *************** *** 24,51 **** # # DORE_LOC is the full pathname of directory containing the dore directory ! DORE_LOC= # DORE_OBJTYPE is the machine object type ! DORE_OBJTYPE= # DORE_LIB_NAME specifies the name of the library to be created DORE_LIB_NAME=libdore.a # Compile options ! CC=cc ! CFLAGS= # Link options when combining .o's LD=ld ! LDFLAGS=-r -s # Archive options AR=ar ! ARFLAGS=q # DORE_LIBTOC specifies how to create a table of contents for a library ! DORE_LIBTOC=ar ts # Name of system module from doresys_config to be included in build DORE_SYSTEM=stdx --- 24,51 ---- # # DORE_LOC is the full pathname of directory containing the dore directory ! #DORE_LOC= # DORE_OBJTYPE is the machine object type ! DORE_OBJTYPE=${ARCH} # DORE_LIB_NAME specifies the name of the library to be created DORE_LIB_NAME=libdore.a # Compile options ! #CC=cc ! #CFLAGS= # Link options when combining .o's LD=ld ! LDFLAGS=-r # Archive options AR=ar ! ARFLAGS=qc # DORE_LIBTOC specifies how to create a table of contents for a library ! DORE_LIBTOC=ranlib # Name of system module from doresys_config to be included in build DORE_SYSTEM=stdx *************** *** 70,86 **** DORE_FONTTYPE=default_type # Install directory for fonts and error message file used by Dore ! DORE_DATADIR=/usr/dore/data # # Installing Dore # # Install directory for Dore library ! DORE_LIBDIR=/usr/lib # Install directory for user include files ! DORE_INCDIR=/usr/include ###################################################################### SHELL=/bin/sh --- 70,86 ---- DORE_FONTTYPE=default_type # Install directory for fonts and error message file used by Dore ! DORE_DATADIR=${PREFIX}/share/dore # # Installing Dore # # Install directory for Dore library ! DORE_LIBDIR=${PREFIX}/lib # Install directory for user include files ! DORE_INCDIR=${PREFIX}/include ###################################################################### SHELL=/bin/sh *************** *** 90,96 **** # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # ! dore: compile library # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # --- 90,98 ---- # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # ! all: dore ! ! dore: compile library data prep-for-examples # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # *************** *** 170,181 **** # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # install_dore: check_doreloc @ echo "Installing Dore' library and include files..." @ if [ -n "$(DORE_LIBDIR)" ]; then \ if [ -d $(DORE_LIBDIR) ]; then \ if [ -f $(LIB_PATH)/$(DORE_LIB_NAME) ]; then \ ! mv $(LIB_PATH)/$(DORE_LIB_NAME) $(DORE_LIBDIR); \ echo "$(DORE_LIB_NAME) installed in $(DORE_LIBDIR)";\ else \ echo "$(LIB_PATH)/$(DORE_LIB_NAME) does not exist";\ --- 172,185 ---- # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # + install: install_dore install_data install_example + install_dore: check_doreloc @ echo "Installing Dore' library and include files..." @ if [ -n "$(DORE_LIBDIR)" ]; then \ if [ -d $(DORE_LIBDIR) ]; then \ if [ -f $(LIB_PATH)/$(DORE_LIB_NAME) ]; then \ ! ${BSD_INSTALL_DATA} $(LIB_PATH)/$(DORE_LIB_NAME) $(DORE_LIBDIR); \ echo "$(DORE_LIB_NAME) installed in $(DORE_LIBDIR)";\ else \ echo "$(LIB_PATH)/$(DORE_LIB_NAME) does not exist";\ *************** *** 192,205 **** @ if [ -n "$(DORE_INCDIR)" ]; then \ if [ -d $(DORE_INCDIR) ]; then \ (cd $(DORE_LOC)/dore/include; \ ! cp dore.h $(DORE_INCDIR); \ find dore_develop -print | \ cpio -padmu $(DORE_INCDIR)); \ echo "C include files installed in $(DORE_INCDIR)"; \ if [ ! -d $(DORE_INCDIR)/fortran ]; then \ mkdir -p $(DORE_INCDIR)/fortran; \ fi; \ ! cp $(DORE_LOC)/dore/include/fortran/* \ $(DORE_INCDIR)/fortran; \ echo "Fortran include files installed in $(DORE_INCDIR)/fortran"; \ else \ --- 196,209 ---- @ if [ -n "$(DORE_INCDIR)" ]; then \ if [ -d $(DORE_INCDIR) ]; then \ (cd $(DORE_LOC)/dore/include; \ ! ${BSD_INSTALL_DATA} dore.h $(DORE_INCDIR); \ find dore_develop -print | \ cpio -padmu $(DORE_INCDIR)); \ echo "C include files installed in $(DORE_INCDIR)"; \ if [ ! -d $(DORE_INCDIR)/fortran ]; then \ mkdir -p $(DORE_INCDIR)/fortran; \ fi; \ ! ${BSD_INSTALL_DATA} $(DORE_LOC)/dore/include/fortran/* \ $(DORE_INCDIR)/fortran; \ echo "Fortran include files installed in $(DORE_INCDIR)/fortran"; \ else \ *************** *** 221,227 **** if [ ! -d $(DORE_DATADIR)/errmsg ]; then \ mkdir -p $(DORE_DATADIR)/errmsg; \ fi; \ ! cp $(DORE_LOC)/dore/src/data/errmsg/errmsgfile \ $(DORE_DATADIR)/errmsg; \ echo "Error message file installed in $(DORE_DATADIR)/errmsg"; \ if [ ! -d $(DORE_DATADIR)/fonts ]; then \ --- 225,231 ---- if [ ! -d $(DORE_DATADIR)/errmsg ]; then \ mkdir -p $(DORE_DATADIR)/errmsg; \ fi; \ ! ${BSD_INSTALL_DATA} $(DORE_LOC)/dore/src/data/errmsg/errmsgfile \ $(DORE_DATADIR)/errmsg; \ echo "Error message file installed in $(DORE_DATADIR)/errmsg"; \ if [ ! -d $(DORE_DATADIR)/fonts ]; then \ *************** *** 331,336 **** --- 335,351 ---- # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # + + prep-for-examples: + @( cd examples/generic; ${MAKE} ) + @( cd examples/util; ${MAKE} ) + @( cd examples/programs/simple; ${MAKE} ) + + install_example: + @${BSD_INSTALL_PROGRAM} examples/programs/simple/render ${PREFIX}/bin/dore_example + @echo "Ok, look at ${PREFIX}/bin/dore_example for an example of" + @echo "Dore in action. You may also wish to look in the work/dore/examples" + @echo "directory for more dore examples." FORCE_IT: