Index: trunk/Makefile.conf.in =================================================================== --- trunk/Makefile.conf.in (nonexistent) +++ trunk/Makefile.conf.in (revision 4418) @@ -0,0 +1,42 @@ +put /tmpasm/OFS { } +put /local/csch/CFLAGS_GENERIC cc/cflags +append /local/csch/CFLAGS_GENERIC cc/fpic +append /local/csch/CFLAGS_GENERIC ?/local/csch/cflags_profile +put /local/csch/CFLAGS /local/csch/CFLAGS_GENERIC +uniq /local/csch/CFLAGS +uniq /local/csch/CFLAGS_GENERIC + +print [@# generated by ./configure, do not modify + +# Compatibility with autotools on DESTDIR - Debian really wants this +# Still keep install_root as well, because that has a better name +Install_root=$(install_root)$(DESTDIR) + +# prefix is @/local/prefix@ +DOCDIR=$(Install_root)@/local/prefix@/share/doc/csch-rnd +LIBDIR=$(Install_root)@/local/prefix@/lib/csch-rnd +BINDIR=$(Install_root)@/local/prefix@/bin +DATADIR=$(Install_root)@/local/prefix@/share/csch-rnd +MAN1DIR=$(Install_root)@/local/prefix@@/local/man1dir@ +CONFDIR=$(Install_root)@/local/confdir@ +RM=@/host/fstools/rm@ +CP=@/host/fstools/cp@ +LN=@/host/fstools/ln@ +MKDIR=@/host/fstools/mkdir@ +SCCBOX=$(ROOT)/scconfig/sccbox +EXE=@/target/sys/ext_exe@ +SCH_RND_HOST_CC=@/host/cc/cc@ +SCH_RND_VER=@/local/version@ + +SCH_RND_CFLAGS=@?cc/argstd/std_c99@ @/local/csch/CFLAGS@ +SCH_RND_C89FLAGS=@/local/csch/c89flags@ @/local/csch/CFLAGS@ + +# The installation directoried to be used from within binaries (with +# install_root/DESTDIR removed) +LIBDIR_INSTALLED=@/local/prefix@/lib/csch-rnd + +# Where librnd is installed, full path to the .mak file to auto-setup +LIBRND_PREFIX=@/local/csch/librnd_prefix@ +LIBRND_MAK=$(LIBRND_PREFIX)/share/librnd3/librnd.mak + +@] Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 4417) +++ trunk/scconfig/Rev.h (revision 4418) @@ -1 +1 @@ -static const int myrev = 4342; +static const int myrev = 4418; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 4417) +++ trunk/scconfig/Rev.tab (revision 4418) @@ -1,3 +1,4 @@ +4418 configure make install 4342 configure embed internal config 4317 configure new core actions about selection 4153 configure ./configure detects font dir Index: trunk/scconfig/hooks.c =================================================================== --- trunk/scconfig/hooks.c (revision 4417) +++ trunk/scconfig/hooks.c (revision 4418) @@ -230,6 +230,7 @@ printf("Generating src/libcschem/Makefile... %s\n", IS_OK(&generr, tmpasm(NULL, "../src/libcschem/Makefile.in", "../src/libcschem/Makefile"))); printf("Generating src/sch-rnd/Makefile... %s\n", IS_OK(&generr, tmpasm(NULL, "../src/sch-rnd/Makefile.in", "../src/sch-rnd/Makefile"))); printf("Generating src/sch-rnd/config.h... %s\n", IS_OK(&generr, tmpasm(NULL, "../src/sch-rnd/config.h.in", "../src/sch-rnd/config.h"))); + printf("Generating Makefile.conf... %s\n", IS_OK(&generr, tmpasm(NULL, "../Makefile.conf.in", "../Makefile.conf"))); if (!generr) { printf("\n\n"); Index: trunk/src/sch-rnd/Makefile.in =================================================================== --- trunk/src/sch-rnd/Makefile.in (revision 4417) +++ trunk/src/sch-rnd/Makefile.in (revision 4418) @@ -123,6 +123,8 @@ $(MAKE) revcheck $(MAKE) all_exe +include $(ROOT)/Makefile.conf + revcheck: cd $(ROOT)/scconfig && ./revtest Rev.stamp < Rev.tab @@ -172,6 +174,8 @@ cd $(ROOT)/src_3rd/ttf2bbox && $(MAKE) ttf_map.o ttf2bbox.o "CC=$(CC)" "CFLAGS=$(CFLAGS)" ### misc ### +map_plugins: + cd ../plugins && ./map_plugins.sh clean: -rm $(OBJS) sch-rnd @/local/pcb/CLEANFILES@ @@ -183,8 +187,25 @@ distclean: clean -rm buildin.c conf_core_fields.h ../plugins/.builtin.pups Makefile defsheet_internal.c conf_internal.c + +install_schrnd: + $(SCCBOX) mkdir -p "$(BINDIR)" "$(DATADIR)" "$(LIBDIR)" "$(LIBDIR)/plugins" "$(CONFDIR)" + $(SCCBOX) $(HOW) "sch-rnd$(EXE)" "$(BINDIR)/sch-rnd$(EXE)" + $(SCCBOX) $(HOW) "sch-rnd-conf.lht" "$(CONFDIR)/sch-rnd-conf.lht" + $(SCCBOX) $(HOW) "menu-default.lht" "$(CONFDIR)/menu-default.lht" + $(SCCBOX) $(HOW) "default-sheet.lht" "$(DATADIR)/default-sheet.lht" + +install: + $(MAKE) install_schrnd HOW="install -f" + +linstall: + $(MAKE) install_schrnd HOW="linstall -f" + +uninstall: + $(MAKE) install_schrnd HOW="uninstall" + map_plugins: - cd ../plugins && ./map_plugins.sh + cd ../src_plugins && PUPLUG=$(PUPLUG) $(LIBRND_LIBDIR)/plugins/map_plugins.sh ../src_plugins @]