diff options
| author | Guido Günther <agx@sigxcpu.org> | 2011-09-26 22:21:04 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2011-09-26 22:21:04 +0200 |
| commit | aeda5d1ae9171f5059d44065796984f390832c6a (patch) | |
| tree | adb5fbda13da5ce1d6175468cb9f847c570a123c /help/Makefile.in | |
| parent | Document changes and release 3.0.1-1 (diff) | |
| parent | New upstream version 3.2.0 (diff) | |
| download | krb5-auth-dialog-aeda5d1ae9171f5059d44065796984f390832c6a.tar.gz krb5-auth-dialog-aeda5d1ae9171f5059d44065796984f390832c6a.tar.bz2 krb5-auth-dialog-aeda5d1ae9171f5059d44065796984f390832c6a.zip | |
Merge commit 'upstream/3.2.0'
Diffstat (limited to 'help/Makefile.in')
| -rw-r--r-- | help/Makefile.in | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/help/Makefile.in b/help/Makefile.in index 9327ded..1d3034d 100644 --- a/help/Makefile.in +++ b/help/Makefile.in @@ -94,8 +94,6 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ COMPILER_FLAGS = @COMPILER_FLAGS@ -CONTROL_CENTER_CFLAGS = @CONTROL_CENTER_CFLAGS@ -CONTROL_CENTER_LIBS = @CONTROL_CENTER_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -183,7 +181,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAM_LIBS = @PAM_LIBS@ -PANELS_DIR = @PANELS_DIR@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ @@ -359,7 +356,7 @@ _DOC_SRC_FIGURES = \ $(foreach fig,$(_DOC_C_FIGURES), $(foreach lc,C $(_DOC_REAL_LINGUAS), \ $(wildcard $(srcdir)/$(lc)/$(patsubst C/%,%,$(fig))) )) -_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot) +_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot,$(if $(DOC_ID),$(DOC_ID).pot)) ################################################################################ _DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \ @@ -659,7 +656,7 @@ _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` _malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl -_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl +_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl @ENABLE_SK_TRUE@_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir` @ENABLE_SK_TRUE@_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir` @ENABLE_SK_TRUE@_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml |