Changeset 551a91 in git

Timestamp:

Sep 11, 2016, 8:11:36 PM (7 years ago)

Author:

Antonio Rojas <arojas@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')

Children:

43fbe81b86fe54b355223a6f9816365e92f73b93

Parents:

1ca2af82a3bd8eac81ea5d1768cd152322082b89

git-author:

Antonio Rojas <arojas@archlinux.org>2016-09-11 20:11:36+02:00

git-committer:

GitHub <noreply@github.com>2016-09-11 20:11:36+02:00

Message:

Specify the variable values in AC_SUBST

Otherwise they are replaced by the empty string in *.desktop.in, producing broken .desktop files

File:

• configure.ac (modified) (1 diff)

configure.ac

@@ -203 +203 @@
 AX_NORMALIZE_PATH([config_datadir],['/'])
 AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
-AC_SUBST(DATA_DIR)
+AC_SUBST(DATA_DIR, "$config_datadir")
 
 AX_RECURSIVE_EVAL([[$]docdir], [config_docdir])
 AX_NORMALIZE_PATH([config_docdir],['/'])
 AC_DEFINE_UNQUOTED([DOC_DIR],"$config_docdir",[docdir])
-AC_SUBST(DOC_DIR)
+AC_SUBST(DOC_DIR, "$config_docdir")
 
 SING_SHOW_FLAGS([Compiler/linker flags: ])