diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-16 11:07:13 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-16 11:07:13 +0200 |
commit | 5861b2783c0615345b80a93470312b36d1cb9907 (patch) | |
tree | 42ded4821e0834063449a5620a1b46bc6f1e509b /package/libfm/patches/patch-configure | |
parent | e3d296fa18ef060fad7e654cd9308e57ffd0934b (diff) | |
parent | d8a75c17f7cb861b42f327afc9a9ec3901133d2c (diff) |
fix conflict
Diffstat (limited to 'package/libfm/patches/patch-configure')
-rw-r--r-- | package/libfm/patches/patch-configure | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/package/libfm/patches/patch-configure b/package/libfm/patches/patch-configure new file mode 100644 index 000000000..5886afec6 --- /dev/null +++ b/package/libfm/patches/patch-configure @@ -0,0 +1,21 @@ +--- libfm-0.1.16.orig/configure 2011-08-09 23:25:14.000000000 +0200 ++++ libfm-0.1.16/configure 2011-09-13 10:20:35.697990682 +0200 +@@ -14181,7 +14181,7 @@ cat >>confdefs.h <<_ACEOF + _ACEOF + + +-ac_config_files="$ac_config_files Makefile src/Makefile src/tests/Makefile data/Makefile data/ui/Makefile po/Makefile.in docs/Makefile docs/reference/Makefile docs/reference/libfm/Makefile libfm.pc libfm-gtk.pc" ++ac_config_files="$ac_config_files Makefile src/Makefile src/tests/Makefile data/Makefile data/ui/Makefile po/Makefile.in libfm.pc libfm-gtk.pc" + + + cat >confcache <<\_ACEOF +@@ -15237,9 +15237,6 @@ do + "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; + "data/ui/Makefile") CONFIG_FILES="$CONFIG_FILES data/ui/Makefile" ;; + "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; +- "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; +- "docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;; +- "docs/reference/libfm/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/libfm/Makefile" ;; + "libfm.pc") CONFIG_FILES="$CONFIG_FILES libfm.pc" ;; + "libfm-gtk.pc") CONFIG_FILES="$CONFIG_FILES libfm-gtk.pc" ;; + "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; |