$NetBSD: patch-ac,v 1.7 2012/11/19 02:56:44 joerg Exp $ --- Makefile.in.orig 2000-02-01 23:22:53.000000000 +0000 +++ Makefile.in @@ -6,7 +6,8 @@ ############################################################################## ############################################################################## # -# XLSLIB -- directory for xlisp executable, startup, example, and help files +# XLSLIB -- directory for xlisp example, and help files +# XLSLIBEXEC -- directory for xlisp executable and startup files # BINDIR -- directory for xlispstat shell script # # For the remaining parameters, if your machine has a subdirectory in the @@ -34,7 +35,8 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ -XLSLIB=${prefix}/lib/xlispstat +XLSLIB=${prefix}/share/xlispstat +XLSLIBEXEC=${prefix}/libexec/xlispstat BINDIR=${exec_prefix}/bin GRAPHSYS = @GRAPHSYS@ @@ -67,11 +69,11 @@ SHELL = /bin/sh .lsp.fsl: echo "(compile-file \"$<\") (exit)" | ./xlisp -CFLAGS = -D${GRAPHSYS} ${UCFLAGS} ${X11INCDIR_FLAG} +CFLAGS += -D${GRAPHSYS} ${UCFLAGS} ${X11INCDIR_FLAG} -Dunix=1 LIBS = ${EXTRALIBS} -lm -LDFLAGS = ${ULDFLAGS} +LDFLAGS += ${ULDFLAGS} OSOBJS = xsdynload.o xssystem.o unixprim.o @@ -118,7 +120,7 @@ CMPFSLFILES = compiler/backquot.fsl comp compiler/assemble.fsl compiler/cmpfront.fsl xlispstat: setup.shell xlisp.wks - ./setup.shell xlispstat ${XLSLIB} + ./setup.shell xlispstat ${XLSLIB} ${XLSLIBEXEC} chmod a+x xlispstat xlisp.wks: xlisp ${CMPFSLFILES} ${FSLFILES} ${AUTOFSLFILES} @@ -141,24 +143,25 @@ X11WINDOWSxlisp: ${OBJS} ${X11WINDOWSOBJ install: installexecs installlsp installexecs: xlispstat xlisp installdirs - -cp xlispstat ${BINDIR}/xlispstat - -cp xlisp ${XLSLIB} + -cp xlispstat ${DESTDIR}${BINDIR}/xlispstat + -cp xlisp ${DESTDIR}${XLSLIBEXEC} installlsp: xlisp.wks xlisp.hlp ${AUTOFSLFILES} ${CMPFSLFILES} installdirs - -cp xlisp.wks ${XLSLIB} - -cp xlisp.hlp ${XLSLIB} - -cp Autoload/_autoidx.lsp Autoload/*.fsl ${XLSLIB}/Autoload - -cp Data/*.lsp ${XLSLIB}/Data - -cp Examples/*.lsp ${XLSLIB}/Examples -# -cp ${CMPFSLFILES} ${XLSLIB}/compiler + -cp xlisp.wks ${DESTDIR}${XLSLIBEXEC} + -cp xlisp.hlp ${DESTDIR}${XLSLIB} + -cp Autoload/_autoidx.lsp Autoload/*.fsl ${DESTDIR}${XLSLIB}/Autoload + -cp Data/*.lsp ${DESTDIR}${XLSLIB}/Data + -cp Examples/*.lsp ${DESTDIR}${XLSLIB}/Examples +# -cp ${CMPFSLFILES} ${DESTDIR}${XLSLIB}/compiler installdirs: - -mkdir -p ${BINDIR} - -mkdir -p ${XLSLIB} - -mkdir ${XLSLIB}/Data - -mkdir ${XLSLIB}/Examples - -mkdir ${XLSLIB}/Autoload -# -mkdir ${XLSLIB}/compiler + -mkdir -p ${DESTDIR}${BINDIR} + -mkdir -p ${DESTDIR}${XLSLIB} + -mkdir -p ${DESTDIR}${XLSLIBEXEC} + -mkdir ${DESTDIR}${XLSLIB}/Data + -mkdir ${DESTDIR}${XLSLIB}/Examples + -mkdir ${DESTDIR}${XLSLIB}/Autoload +# -mkdir ${DESTDIR}${XLSLIB}/compiler clean: rm -f core *.o *~ *.fsl compiler/*.fsl Autoload/*.fsl foreign.h