head 1.1; access; symbols OPENPKG_E1_MP_HEAD:1.1 OPENPKG_E1_MP:1.1 OPENPKG_E1_MP_2_STABLE:1.1.2.2 OPENPKG_E1_FP:1.1.2.2 OPENPKG_2_STABLE_MP:1.1 OPENPKG_2_STABLE_20061018:1.1.2.2 OPENPKG_2_STABLE:1.1.0.2; locks; strict; comment @# @; 1.1 date 2006.04.17.13.36.15; author rse; state Exp; branches 1.1.2.1; next ; commitid yry100nFT6E8swtr; 1.1.2.1 date 2006.04.17.13.36.15; author rse; state dead; branches; next 1.1.2.2; commitid iZxwRSmmWscPXUQr; 1.1.2.2 date 2006.10.16.14.56.18; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.1 log @new package: sgrep 1.94a (Structured Global Regular Expression Print) @ text @Index: Makefile.in --- Makefile.in.orig 2004-11-19 19:23:36 +0100 +++ Makefile.in 2006-04-17 15:32:42 +0200 @@@@ -95,7 +95,7 @@@@ # Sgrep needs to know its share directory -INCLUDES = -DDATADIR="\"${datadir}\"" +INCLUDES = -DDATADIR="\"${sysconfdir}\"" bin_PROGRAMS = sgrep libsgrep_SOURCES = main.c preproc.c common.c parser.c optimize.c pmatch.c \ @@@@ -310,20 +310,20 @@@@ dataDATA_INSTALL = $(INSTALL_DATA) install-dataDATA: $(data_DATA) @@$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(datadir) + $(mkinstalldirs) $(DESTDIR)$(sysconfdir) @@list='$(data_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(dataDATA_INSTALL) $$d$$p $(DESTDIR)$(datadir)/$$f"; \ - $(dataDATA_INSTALL) $$d$$p $(DESTDIR)$(datadir)/$$f; \ + echo " $(dataDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f"; \ + $(dataDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \ done uninstall-dataDATA: @@$(NORMAL_UNINSTALL) @@list='$(data_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(datadir)/$$f"; \ - rm -f $(DESTDIR)$(datadir)/$$f; \ + echo " rm -f $(DESTDIR)$(sysconfdir)/$$f"; \ + rm -f $(DESTDIR)$(sysconfdir)/$$f; \ done ETAGS = etags @@@@ -454,7 +454,7 @@@@ all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) config.h all-local installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(datadir) + $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(sysconfdir) install: install-am install-exec: install-exec-am @ 1.1.2.1 log @file sgrep.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:56:18 +0000 @ text @d1 47 @ 1.1.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 47 Index: Makefile.in --- Makefile.in.orig 2004-11-19 19:23:36 +0100 +++ Makefile.in 2006-04-17 15:32:42 +0200 @@@@ -95,7 +95,7 @@@@ # Sgrep needs to know its share directory -INCLUDES = -DDATADIR="\"${datadir}\"" +INCLUDES = -DDATADIR="\"${sysconfdir}\"" bin_PROGRAMS = sgrep libsgrep_SOURCES = main.c preproc.c common.c parser.c optimize.c pmatch.c \ @@@@ -310,20 +310,20 @@@@ dataDATA_INSTALL = $(INSTALL_DATA) install-dataDATA: $(data_DATA) @@$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(datadir) + $(mkinstalldirs) $(DESTDIR)$(sysconfdir) @@list='$(data_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(dataDATA_INSTALL) $$d$$p $(DESTDIR)$(datadir)/$$f"; \ - $(dataDATA_INSTALL) $$d$$p $(DESTDIR)$(datadir)/$$f; \ + echo " $(dataDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f"; \ + $(dataDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \ done uninstall-dataDATA: @@$(NORMAL_UNINSTALL) @@list='$(data_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(datadir)/$$f"; \ - rm -f $(DESTDIR)$(datadir)/$$f; \ + echo " rm -f $(DESTDIR)$(sysconfdir)/$$f"; \ + rm -f $(DESTDIR)$(sysconfdir)/$$f; \ done ETAGS = etags @@@@ -454,7 +454,7 @@@@ all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) config.h all-local installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(datadir) + $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(sysconfdir) install: install-am install-exec: install-exec-am @