aboutsummaryrefslogtreecommitdiff
path: root/etc/Makefile.am
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2012-09-28 14:15:44 +0300
committerSergey Poznyakoff <gray@gnu.org.ua>2012-09-28 14:15:44 +0300
commit4aef6e9feff509e8cb267473d505e82dd794df78 (patch)
tree7fd0ae1364812384858a7dfbf665c542b2d3ca0e /etc/Makefile.am
parentac1d6cbbcf5323d5db59886b98a24c45bafa64b8 (diff)
downloadeclat-4aef6e9feff509e8cb267473d505e82dd794df78.tar.gz
eclat-4aef6e9feff509e8cb267473d505e82dd794df78.tar.bz2
Add user-defined formats.
* etc/Makefile.am: Minor fixes. * src/cmdline.opt: New option --format. Add alias --formfile to --format-file * src/config.c: New configuration statement "define-format". * src/eclat.c (define_format): Rename to set_command_format. All uses changed. (define_format,find_format): New functions (read_format): Compile named format, if supplied with the --format option. * src/eclat.h: Update.
Diffstat (limited to 'etc/Makefile.am')
-rw-r--r--etc/Makefile.am16
1 files changed, 8 insertions, 8 deletions
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 5eec565..56510a3 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -25,8 +25,6 @@ FLNFILES=\
EXTRA_DIST=$(FLNFILES) default.fln eclat.cfin
-noinst_SCRIPTS=eclat.conf
-CLEANFILES=eclat.conf
SUFFIXES=.cfin .conf
if SPLIT_FORMATS
@@ -34,27 +32,29 @@ SUFFIXES += .forlan .fln
.fln.forlan:
$(AM_V_GEN)$(abs_builddir)/flncat $< default.fln > $@
formatdir = @FORMATDIR@
-noinst_SCRIPTS += $(FLNFILES:.fln=.forlan)
-CLEANFILES += $(FLNFILES:.fln=.forlan)
+FORMATFILES = $(FLNFILES:.fln=.forlan)
FORMATNAME = $${command}
else
formatdir = @FORMATDIR@
-noinst_SCRIPTS += eclat.forlan
-CLEANFILES += eclat.forlan
+FORMATFILES = eclat.forlan
eclat.forlan: $(FLNFILES) default.fln
$(AM_V_GEN)(cd $(srcdir); $(abs_builddir)/flncat $(FLNFILES) default.fln) > eclat.forlan
FORMATNAME = eclat
endif
+noinst_SCRIPTS=eclat.conf $(FORMATFILES)
+CLEANFILES=eclat.conf $(FORMATFILES)
+
.cfin.conf:
$(AM_V_GEN)sed 's^FORMATDIR^$(formatdir)^;s^FORMATNAME^$(FORMATNAME)^' $< > $@
install-data-local:
@test -z "$(DESTDIR)$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
@if [ -r $(DESTDIR)$(sysconfdir)/eclat.conf ]; then :; \
- else ${INSTALL} -m 644 $(top_srcdir)/src/eclat.conf \
+ else ${INSTALL} -m 644 $(top_srcdir)/etc/eclat.conf \
$(DESTDIR)$(sysconfdir)/eclat.conf; \
- for file in $(noinst_SCRIPTS); do \
+ ${INSTALL} -d $(DESTDIR)$(formatdir); \
+ for file in $(FORMATFILES); do \
${INSTALL} -m 644 $$file $(DESTDIR)$(formatdir)/$$file; \
done; \
fi

Return to:

Send suggestions and report system problems to the System administrator.