Missed a number of Makefiles in directories two levels down.
This commit is contained in:
parent
4c5f027104
commit
da7cc2096d
10
Makefile
10
Makefile
|
|
@ -77,12 +77,14 @@ install-real: install-dirs
|
||||||
(cd $$dir && ${MAKE} install); done
|
(cd $$dir && ${MAKE} install); done
|
||||||
|
|
||||||
install-tcl-dirs:
|
install-tcl-dirs:
|
||||||
${MAGICDIR}/scripts/mkdirs $(DESTDIR)${INSTALL_BINDIR} $(DESTDIR)${INSTALL_MANDIR} \
|
${MAGICDIR}/scripts/mkdirs $(DESTDIR)${INSTALL_BINDIR} \
|
||||||
$(DESTDIR)${SYSDIR} $(DESTDIR)${INSTALL_TCLDIR} $(DESTDIR)${INSTALL_TCLDIR}/bitmaps
|
$(DESTDIR)${INSTALL_MANDIR} $(DESTDIR)${INSTALL_SYSDIR} \
|
||||||
|
$(DESTDIR)${INSTALL_TCLDIR} $(DESTDIR)${INSTALL_TCLDIR}/bitmaps
|
||||||
|
|
||||||
install-dirs:
|
install-dirs:
|
||||||
${MAGICDIR}/scripts/mkdirs $(DESTDIR)${INSTALL_BINDIR} $(DESTDIR)${INSTALL_MANDIR} \
|
${MAGICDIR}/scripts/mkdirs $(DESTDIR)${INSTALL_BINDIR} \
|
||||||
$(DESTDIR)${INSTALL_SYSDIR} $(DESTDIR)${INSTALL_SCMDIR}
|
$(DESTDIR)${INSTALL_MANDIR} $(DESTDIR)${INSTALL_SYSDIR} \
|
||||||
|
$(DESTDIR)${INSTALL_SCMDIR}
|
||||||
|
|
||||||
install-tcl:
|
install-tcl:
|
||||||
@echo --- installing executable to $(DESTDIR)${INSTALL_BINDIR}
|
@echo --- installing executable to $(DESTDIR)${INSTALL_BINDIR}
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ MAGICDIR = ../..
|
||||||
|
|
||||||
include $(MAGICDIR)/defs.mak
|
include $(MAGICDIR)/defs.mak
|
||||||
|
|
||||||
HTML_INSTDIR=$(LIBDIR)/magic/doc/html
|
HTML_INSTDIR=$(INSTALL_LIBDIR)/magic/doc/html
|
||||||
|
|
||||||
install: $(DESTDIR)${HTML_INSTDIR}
|
install: $(DESTDIR)${HTML_INSTDIR}
|
||||||
tar cf - . | (cd $(DESTDIR)${HTML_INSTDIR}; tar xf - )
|
tar cf - . | (cd $(DESTDIR)${HTML_INSTDIR}; tar xf - )
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ MAGICDIR = ../..
|
||||||
include $(MAGICDIR)/defs.mak
|
include $(MAGICDIR)/defs.mak
|
||||||
|
|
||||||
PS_SRCDIR=../psfiles
|
PS_SRCDIR=../psfiles
|
||||||
PS_INSTDIR=$(LIBDIR)/magic/doc
|
PS_INSTDIR=$(INSTALL_LIBDIR)/magic/doc
|
||||||
|
|
||||||
.SUFFIXES: .dvi .tex .ps
|
.SUFFIXES: .dvi .tex .ps
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,36 +15,36 @@ EQN=eqn -Ppsc
|
||||||
include ${MAGICDIR}/defs.mak
|
include ${MAGICDIR}/defs.mak
|
||||||
|
|
||||||
MANFILES = \
|
MANFILES = \
|
||||||
$(DESTDIR)${MANDIR}/man1/ext2spice.1 \
|
$(DESTDIR)${INSTALL_MANDIR}/man1/ext2spice.1 \
|
||||||
$(DESTDIR)${MANDIR}/man1/extcheck.1 \
|
$(DESTDIR)${INSTALL_MANDIR}/man1/extcheck.1 \
|
||||||
$(DESTDIR)${MANDIR}/man1/ext2sim.1 \
|
$(DESTDIR)${INSTALL_MANDIR}/man1/ext2sim.1 \
|
||||||
$(DESTDIR)${MANDIR}/man1/magic.1 \
|
$(DESTDIR)${INSTALL_MANDIR}/man1/magic.1 \
|
||||||
$(DESTDIR)${MANDIR}/man5/cmap.5 \
|
$(DESTDIR)${INSTALL_MANDIR}/man5/cmap.5 \
|
||||||
$(DESTDIR)${MANDIR}/man5/displays.5 \
|
$(DESTDIR)${INSTALL_MANDIR}/man5/displays.5 \
|
||||||
$(DESTDIR)${MANDIR}/man5/dlys.5 \
|
$(DESTDIR)${INSTALL_MANDIR}/man5/dlys.5 \
|
||||||
$(DESTDIR)${MANDIR}/man5/dstyle.5 \
|
$(DESTDIR)${INSTALL_MANDIR}/man5/dstyle.5 \
|
||||||
$(DESTDIR)${MANDIR}/man5/ext.5 \
|
$(DESTDIR)${INSTALL_MANDIR}/man5/ext.5 \
|
||||||
$(DESTDIR)${MANDIR}/man5/glyphs.5 \
|
$(DESTDIR)${INSTALL_MANDIR}/man5/glyphs.5 \
|
||||||
$(DESTDIR)${MANDIR}/man5/mag.5 \
|
$(DESTDIR)${INSTALL_MANDIR}/man5/mag.5 \
|
||||||
$(DESTDIR)${MANDIR}/man5/net.5 \
|
$(DESTDIR)${INSTALL_MANDIR}/man5/net.5 \
|
||||||
$(DESTDIR)${MANDIR}/man5/sim.5
|
$(DESTDIR)${INSTALL_MANDIR}/man5/sim.5
|
||||||
|
|
||||||
install: ${MANFILES}
|
install: ${MANFILES}
|
||||||
|
|
||||||
$(DESTDIR)${MANDIR}:
|
$(DESTDIR)${INSTALL_MANDIR}:
|
||||||
${SCRIPTS}/mkdirs $(DESTDIR)${MANDIR}
|
${SCRIPTS}/mkdirs $(DESTDIR)${INSTALL_MANDIR}
|
||||||
|
|
||||||
$(DESTDIR)${MANDIR}/man1: $(DESTDIR)${MANDIR}
|
$(DESTDIR)${INSTALL_MANDIR}/man1: $(DESTDIR)${INSTALL_MANDIR}
|
||||||
${SCRIPTS}/mkdirs $(DESTDIR)${MANDIR}/man1
|
${SCRIPTS}/mkdirs $(DESTDIR)${INSTALL_MANDIR}/man1
|
||||||
|
|
||||||
$(DESTDIR)${MANDIR}/man1/%: % $(DESTDIR)${MANDIR}/man1
|
$(DESTDIR)${INSTALL_MANDIR}/man1/%: % $(DESTDIR)${INSTALL_MANDIR}/man1
|
||||||
${CP} $* $(DESTDIR)${MANDIR}/man1/$*
|
${CP} $* $(DESTDIR)${INSTALL_MANDIR}/man1/$*
|
||||||
|
|
||||||
$(DESTDIR)${MANDIR}/man5: $(DESTDIR)${MANDIR}
|
$(DESTDIR)${INSTALL_MANDIR}/man5: $(DESTDIR)${INSTALL_MANDIR}
|
||||||
${SCRIPTS}/mkdirs $(DESTDIR)${MANDIR}/man5
|
${SCRIPTS}/mkdirs $(DESTDIR)${INSTALL_MANDIR}/man5
|
||||||
|
|
||||||
$(DESTDIR)${MANDIR}/man5/%: % $(DESTDIR)${MANDIR}/man5
|
$(DESTDIR)${INSTALL_MANDIR}/man5/%: % $(DESTDIR)${INSTALL_MANDIR}/man5
|
||||||
${CP} $* $(DESTDIR)${MANDIR}/man5/$*
|
${CP} $* $(DESTDIR)${INSTALL_MANDIR}/man5/$*
|
||||||
|
|
||||||
mans:
|
mans:
|
||||||
${SCRIPTS}/printmans "${TROFF} ${MANMACS} -" *.1 *.5
|
${SCRIPTS}/printmans "${TROFF} ${MANMACS} -" *.1 *.5
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ MAGICDIR = ../..
|
||||||
|
|
||||||
include ${MAGICDIR}/defs.mak
|
include ${MAGICDIR}/defs.mak
|
||||||
|
|
||||||
TUTDIR = ${LIBDIR}/magic/tutorial
|
TUTDIR = ${INSTALL_LIBDIR}/magic/tutorial
|
||||||
|
|
||||||
TUTFILES= m3a.mag maint2a.mag tut1.mag \
|
TUTFILES= m3a.mag maint2a.mag tut1.mag \
|
||||||
tut2a.mag tut2b.mag tut2c.mag tut2d.mag \
|
tut2a.mag tut2b.mag tut2c.mag tut2d.mag \
|
||||||
|
|
|
||||||
|
|
@ -21,8 +21,7 @@ all: $(OBJS_DIR) $(CIFIN) $(CIFOUT) $(IBMCIFIN) $(IBMCIFOUT) $(TMCIFIN) \
|
||||||
$(TMCIFOUT) $(SUBCIFIN) $(SUBCIFOUT)
|
$(TMCIFOUT) $(SUBCIFIN) $(SUBCIFOUT)
|
||||||
|
|
||||||
clean:;
|
clean:;
|
||||||
rm -f $(CIFIN) $(CIFOUT) $(IBMCIFIN) $(IBMCIFOUT) $(TMCIFIN) \
|
rm -rf $(OBJS_DIR)
|
||||||
$(TMCIFOUT) $(SUBCIFIN) $(SUBCIFOUT)
|
|
||||||
|
|
||||||
scg: cifout.c cifout-cmos26b.gen cifout.gen cifout.nw\
|
scg: cifout.c cifout-cmos26b.gen cifout.gen cifout.nw\
|
||||||
cifout.others cifout.pw cifout.scgnw cifout.scgpw
|
cifout.others cifout.pw cifout.scgnw cifout.scgpw
|
||||||
|
|
|
||||||
|
|
@ -640,7 +640,7 @@ gr_dflags
|
||||||
gr_cflags
|
gr_cflags
|
||||||
rl_libs
|
rl_libs
|
||||||
rl_defs
|
rl_defs
|
||||||
dist_prefix
|
DIST_DIR
|
||||||
cadinstall
|
cadinstall
|
||||||
programs
|
programs
|
||||||
unused
|
unused
|
||||||
|
|
@ -6143,15 +6143,15 @@ fi
|
||||||
# place that is a temporary staging area, like DESTDIR, but unlike DESTDIR,
|
# place that is a temporary staging area, like DESTDIR, but unlike DESTDIR,
|
||||||
# the prefix is replaced by the destination directory, rather than appended
|
# the prefix is replaced by the destination directory, rather than appended
|
||||||
# to it.
|
# to it.
|
||||||
dist_prefix="\${exec_prefix}"
|
DIST_DIR="\${exec_prefix}"
|
||||||
|
|
||||||
# Check whether --with-distdir was given.
|
# Check whether --with-distdir was given.
|
||||||
if test "${with_distdir+set}" = set; then :
|
if test "${with_distdir+set}" = set; then :
|
||||||
withval=$with_distdir;
|
withval=$with_distdir;
|
||||||
if test "$withval" = "no" -o "$withval" = "NO" ; then
|
if test "$withval" = "no" -o "$withval" = "NO" ; then
|
||||||
dist_prefix="\${exec_prefix}"
|
DIST_DIR="\${exec_prefix}"
|
||||||
else
|
else
|
||||||
dist_prefix=$arg
|
DIST_DIR=${withval}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue