diff options
| author | Gaël Bonithon <gael@xfce.org> | 2022-01-09 10:59:43 +0100 |
|---|---|---|
| committer | Gaël Bonithon <gael@xfce.org> | 2022-01-09 11:15:37 +0100 |
| commit | cb5feb8cf76c7b2009c3d5273461da7d352d6d93 (patch) | |
| tree | 94d8398c882a0973ba0a80f60315cb288f622512 | |
| parent | 19dd29632d698360faf0559895b0b03119eb1370 (diff) | |
| download | tumbler-cb5feb8cf76c7b2009c3d5273461da7d352d6d93.tar.gz | |
Build: Check for best possible grep, egrep, sed
In particular, $EGREP was introduced in
d82e509551db98ff70e47d1990f759948ee7fecd whithout check.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | tumblerd/Makefile.am | 7 |
3 files changed, 9 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index ea0fb27..867d581 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,7 +34,7 @@ distclean-local: rm -rf *.spec *.cache *~ distuninstallcheck_listfiles = \ - find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache + find . -type f -print | $(GREP) -v ./share/icons/hicolor/icon-theme.cache .PHONY: ChangeLog diff --git a/configure.ac b/configure.ac index 370506d..9da1472 100644 --- a/configure.ac +++ b/configure.ac @@ -96,6 +96,9 @@ AC_PROG_CC() AM_PROG_CC_C_O() AC_PROG_INSTALL() IT_PROG_INTLTOOL([0.35.0], [no-xml]) +AC_PROG_GREP() +AC_PROG_EGREP() +AC_PROG_SED() dnl *********************** dnl *** Prepare libtool *** @@ -119,7 +122,7 @@ AC_CHECK_FUNCS([sched_getparam sched_setscheduler getpwnam]) dnl ****************************** dnl *** Check for i18n support *** dnl ****************************** -linguas=`ls po/*.po | sed s/.po//g | sed sApo/AA | xargs` +linguas=$(ls po/*.po | $SED s/.po//g | $SED sApo/AA | xargs) XDT_I18N([$linguas]) dnl ************************* diff --git a/tumblerd/Makefile.am b/tumblerd/Makefile.am index 1c3e76e..deb9a06 100644 --- a/tumblerd/Makefile.am +++ b/tumblerd/Makefile.am @@ -100,8 +100,9 @@ systemd_user_in_files = tumblerd.service.in systemd_user_DATA = $(systemd_user_in_files:.service.in=.service) %.service: %.service.in - sed -e "s,\@libdir\@,$(libdir),g" \ - -e "s,\@TUMBLER_VERSION_API\@,$(TUMBLER_VERSION_API),g" < $< > $@ + $(SED) -e "s,\@libdir\@,$(libdir),g" \ + -e "s,\@TUMBLER_VERSION_API\@,$(TUMBLER_VERSION_API),g" < $< > $@ + confdir = $(sysconfdir)/xdg/tumbler conf_DATA = \ @@ -147,4 +148,4 @@ tumbler-cache-service-gdbus.c: tumbler-cache-service-dbus.xml Makefile --interface-prefix org.freedesktop.thumbnails.Cache1 \ --c-namespace Tumbler \ --generate-c-code tumbler-cache-service-gdbus \ - $(srcdir)/tumbler-cache-service-dbus.xml
\ No newline at end of file + $(srcdir)/tumbler-cache-service-dbus.xml |