mirror of
https://github.com/RTimothyEdwards/magic.git
synced 2026-08-29 17:39:28 +02:00
Merge branch 'master' into bplane
Conflicts: VERSION database/DBcellsrch.c database/DBconnect.c extract/ExtInter.c lef/Depend utils/Depend Updated bplane branch with all changes to master since the bplane branch was last modified.
This commit is contained in:
+4
-4
@@ -28,10 +28,10 @@ tclplot${SHDLIB_EXT}: tclplot.o ${OBJS}
|
||||
${CC} ${CFLAGS} ${CPPFLAGS} -o $@ ${LDDL_FLAGS} tclplot.o ${OBJS} \
|
||||
${EXTRA_LIBS} -lc ${LIBS}
|
||||
|
||||
install-tcl: $(DESTDIR)${TCLDIR}/tclplot${SHDLIB_EXT}
|
||||
install-tcl: $(DESTDIR)${INSTALL_TCLDIR}/tclplot${SHDLIB_EXT}
|
||||
|
||||
$(DESTDIR)${TCLDIR}/tclplot${SHDLIB_EXT}: tclplot${SHDLIB_EXT}
|
||||
${RM} $(DESTDIR)${TCLDIR}/tclplot${SHDLIB_EXT}
|
||||
${CP} tclplot${SHDLIB_EXT} $(DESTDIR)${TCLDIR}/tclplot${SHDLIB_EXT}
|
||||
$(DESTDIR)${INSTALL_TCLDIR}/tclplot${SHDLIB_EXT}: tclplot${SHDLIB_EXT}
|
||||
${RM} $(DESTDIR)${INSTALL_TCLDIR}/tclplot${SHDLIB_EXT}
|
||||
${CP} tclplot${SHDLIB_EXT} $(DESTDIR)${INSTALL_TCLDIR}/tclplot${SHDLIB_EXT}
|
||||
|
||||
include ${MAGICDIR}/rules.mak
|
||||
|
||||
Reference in New Issue
Block a user