← Back to branch summary

~ubuntu-branches/ubuntu/raring/gdm/raring

« back to all changes in this revision

Viewing changes to docs/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2009-07-17 11:41:35 UTC
  • mfrom: (1.4.32 upstream)
  • Revision ID: james.westby@ubuntu.com-20090717114135-1ql0hht1lumoiscv
Tags: 2.26.1git20090717-0ubuntu1
https://launchpad.net/bugs/395324
* Update to latest upstream git head:
  - Make greeter login window be a dock. Fixes metacity complaining about
    session management. (LP: #395324)
* Drop patches which are fixed upstream:
  - 00git-greeter-session-management.patch
  - 00git-invalid-dmrc-layout.patch
  - 00git-use-after-free.patch
  - 00git-xklavier4.patch
  - 02_dont_force_us_keyboard.patch
  - 04_polkit1.patch
* 80_workaround_incorrect_directories.patch: Update to new upstream version.
* Drop 01_xconfigoptions.patch; these configure variables are not used any
  more in the upstream code, and upstream supplies the X.org -br option by
  default now. Also drop the corresponding configure changes from
  17_update_default_xserver.patch.
* Apply 15_usplash.patch to debian/gdm.init and drop the patch.
* 17_update_default_xserver.patch: Update to new upstream version, add
  corresponding configure change, add patch tag header, forward upstream,
  and rename to 02_x_server_location.patch.
* Drop 99_autoreconf.patch. The only remaining build system change is the
  previous item.
* Drop 20_xdm-stuff.patch, it's just cruft.
* Drop debian/Xsession, and change debian/rules to install the upstream one.
* 01_xrdb_nocpp.patch: Add patch tag header, forward upstream.
* Rename 80_workaround_incorrect_directories.patch to
  04_fix_external_program_directories.patch and add patch tag header.
* Rename 81_initial_server_on_vt7.patch to 05_initial_server_on_vt7.patch.
* debian/rules: Remove /var/gdm (empty and nonstandard) and /var/run (will
  be created at runtime), thanks lintian.
* debian/copyright: Point to versioned GPL, thanks lintian.
* debian/gdm.postrm: Use "set -e" to conform to policy.
* Add debian/xterm.desktop: Reintroduce "failsafe xterm" session.

Show diffs side-by-side

added added

removed removed

Lines of Context:
docs/Makefile.in
154
154
GTK_LIBS = @GTK_LIBS@
155
155
HAVE_LIBXKLAVIER = @HAVE_LIBXKLAVIER@
156
156
HAVE_PAM = @HAVE_PAM@
157
 
HAVE_POLKIT_GNOME = @HAVE_POLKIT_GNOME@
158
157
HELP_DIR = @HELP_DIR@
159
158
INSTALL = @INSTALL@
160
159
INSTALL_DATA = @INSTALL_DATA@
208
207
PKG_CONFIG = @PKG_CONFIG@
209
208
PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
210
209
POFILES = @POFILES@
211
 
POLKIT_GNOME_CFLAGS = @POLKIT_GNOME_CFLAGS@
212
 
POLKIT_GNOME_LIBS = @POLKIT_GNOME_LIBS@
213
210
POSUB = @POSUB@
214
211
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
215
212
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
349
346
 
350
347
################################################################################
351
348
_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
 
349
_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page))
352
350
_DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent))
353
351
_DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc))
354
352
_DOC_C_DOCS = \
355
353
        $(_DOC_C_ENTITIES)      $(_DOC_C_INCLUDES)                      \
356
 
        $(_DOC_C_MODULE)
 
354
        $(_DOC_C_PAGES)         $(_DOC_C_MODULE)
357
355
 
358
356
_DOC_C_DOCS_NOENT = \
359
 
        $(_DOC_C_MODULE)        $(_DOC_C_INCLUDES)
 
357
        $(_DOC_C_MODULE)        $(_DOC_C_INCLUDES)                      \
 
358
        $(_DOC_C_PAGES)
360
359
 
361
360
_DOC_C_FIGURES = $(if $(DOC_FIGURES),                                   \
362
361
        $(foreach fig,$(DOC_FIGURES),C/$(fig)),                         \
372
371
 
373
372
 
374
373
###############################################################################
375
 
_DOC_POFILES = $(if $(DOC_MODULE),                                              \
 
374
_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID),                                     \
376
375
        $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
377
376
 
378
377
_DOC_LC_MODULES = $(if $(DOC_MODULE),                                           \
379
378
        $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
380
379
 
 
380
_DOC_LC_PAGES = \
 
381
        $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES),       \
 
382
                $(lc)/$(notdir $(page)) ))
 
383
 
381
384
_DOC_LC_INCLUDES = \
382
385
        $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES),     \
383
386
                $(lc)/$(notdir $(inc)) ))
389
392
                $(lc)/$(notdir $(doc)) ))
390
393
 
391
394
_DOC_LC_DOCS = \
392
 
        $(_DOC_LC_MODULES)      $(_DOC_LC_INCLUDES)                             \
 
395
        $(_DOC_LC_MODULES)      $(_DOC_LC_INCLUDES)     $(_DOC_LC_PAGES)        \
393
396
        $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
394
397
 
395
398
_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS),                            \
409
412
_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
410
413
_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
411
414
_clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
412
 
_clean_dir = $(if $(DOC_MODULE),clean-doc-dir)
 
415
_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
 
416
_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
413
417
DOC_MODULE = gdm
414
418
DOC_ENTITIES = legal.xml
415
419
DOC_INCLUDES = 
416
 
DOC_LINGUAS = de en_GB es fr it ko oc ru sv uk 
 
420
DOC_LINGUAS = de el en_GB es fr it ko oc ru sv uk 
417
421
all: all-am
418
422
 
419
423
.SUFFIXES:
646
650
 
647
651
DOC_MODULE ?=
648
652
 
 
653
DOC_ID ?=
 
654
 
 
655
DOC_PAGES ?=
 
656
 
649
657
DOC_ENTITIES ?=
650
658
 
651
659
DOC_INCLUDES ?=
662
670
 
663
671
_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
664
672
_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
 
673
_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
665
674
_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
666
675
_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
667
676
_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
724
733
$(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
725
734
        if ! test -d $(dir $@); then mkdir $(dir $@); fi
726
735
        if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
 
736
        po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \
 
737
        if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \
727
738
        (cd $(dir $@) && \
728
 
          $(_xml2po) -e -p \
729
 
            "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \
 
739
          $(_xml2po) -e -p "$${po}" \
730
740
            "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
731
741
            cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
732
742
.PHONY: pot
744
754
        $(_DOC_OMF_ALL)         $(_DOC_DSK_ALL)         \
745
755
        $(_DOC_HTML_ALL)        $(_DOC_POFILES)
746
756
 
 
757
################################################################################
 
758
 
747
759
.PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
748
760
 
749
761
clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
785
797
        $(_clean_omf)           $(_clean_dsk)           \
786
798
        $(_clean_lc)            $(_clean_dir)
787
799
 
788
 
.PHONY: dist-doc-docs dist-doc-figs dist-doc-omf dist-doc-dsk
789
 
doc-dist-hook:                                  \
790
 
        $(if $(DOC_MODULE),dist-doc-docs)       \
791
 
        $(if $(_DOC_C_FIGURES),dist-doc-figs)   \
 
800
################################################################################
 
801
 
 
802
.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk
 
803
doc-dist-hook:                                          \
 
804
        $(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs)      \
 
805
        $(if $(_DOC_C_FIGURES),dist-doc-figs)           \
792
806
        $(if $(_DOC_OMF_IN),dist-doc-omf)
793
807
#       $(if $(_DOC_DSK_IN),dist-doc-dsk)
794
808
 
834
848
        echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \
835
849
        $(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))"
836
850
 
 
851
################################################################################
 
852
 
837
853
.PHONY: check-doc-docs check-doc-omf
838
854
check:                                                  \
839
855
        $(if $(DOC_MODULE),check-doc-docs)              \
 
856
        $(if $(DOC_ID),check-doc-pages)                 \
840
857
        $(if $(_DOC_OMF_IN),check-doc-omf)
841
858
 
842
859
check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
852
869
          xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \
853
870
        done
854
871
 
 
872
check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES)
 
873
        for lc in C $(_DOC_REAL_LINGUAS); do \
 
874
          if test -f "$$lc"; \
 
875
            then d=; \
 
876
            xmlpath="$$lc"; \
 
877
          else \
 
878
            d="$(srcdir)/"; \
 
879
            xmlpath="$$lc:$(srcdir)/$$lc"; \
 
880
          fi; \
 
881
          for page in $(DOC_PAGES); do \
 
882
            echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \
 
883
            xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \
 
884
          done; \
 
885
        done
 
886
 
855
887
check-doc-omf: $(_DOC_OMF_ALL)
856
888
        @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
857
889
          echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
858
890
          xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
859
891
        done
860
892
 
 
893
################################################################################
 
894
 
861
895
.PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
 
896
 
862
897
install-data-local:                                     \
863
 
        $(if $(DOC_MODULE),install-doc-docs)            \
 
898
        $(if $(DOC_MODULE)$(DOC_ID),install-doc-docs)   \
864
899
        $(if $(_DOC_HTML_ALL),install-doc-html)         \
865
900
        $(if $(_DOC_C_FIGURES),install-doc-figs)        \
866
901
        $(if $(_DOC_OMF_IN),install-doc-omf)
868
903
 
869
904
install-doc-docs:
870
905
        @for lc in C $(_DOC_REAL_LINGUAS); do \
871
 
          echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc"; \
872
 
          $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc; \
 
906
          echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \
 
907
          $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \
873
908
        done
874
909
        @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
875
910
          if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
876
911
          docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
877
 
          docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
 
912
          docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \
878
913
          if ! test -d "$$docdir"; then \
879
914
            echo "$(mkinstalldirs) $$docdir"; \
880
915
            $(mkinstalldirs) "$$docdir"; \
881
916
          fi; \
882
 
          echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
883
 
          $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
 
917
          echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
 
918
          $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \
884
919
        done
885
920
 
886
921
install-doc-figs:
895
930
              figsymlink=true; \
896
931
            fi; \
897
932
            figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
898
 
            figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
 
933
            figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \
899
934
            if ! test -d "$$figdir"; then \
900
935
              echo "$(mkinstalldirs) $$figdir"; \
901
936
              $(mkinstalldirs) "$$figdir"; \
915
950
        echo install-html
916
951
 
917
952
install-doc-omf:
918
 
        $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)
 
953
        $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)
919
954
        @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
920
 
          echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
921
 
          $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf; \
 
955
          echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
 
956
          $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \
922
957
        done
923
958
        @if test "x$(_ENABLE_SK)" = "xtrue"; then \
924
 
          echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
925
 
          scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
 
959
          echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
 
960
          scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
926
961
        fi;
927
962
 
928
963
install-doc-dsk:
929
964
        echo install-dsk
930
965
 
 
966
################################################################################
 
967
 
931
968
.PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk
932
969
uninstall-local:                                        \
933
 
        $(if $(DOC_MODULE),uninstall-doc-docs)          \
 
970
        $(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs) \
934
971
        $(if $(_DOC_HTML_ALL),uninstall-doc-html)       \
935
972
        $(if $(_DOC_C_FIGURES),uninstall-doc-figs)      \
936
973
        $(if $(_DOC_OMF_IN),uninstall-doc-omf)
938
975
 
939
976
uninstall-doc-docs:
940
977
        @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
941
 
          echo " rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
942
 
          rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
 
978
          echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
 
979
          rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
943
980
        done
944
981
 
945
982
uninstall-doc-figs:
946
983
        @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \
947
 
          echo "rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \
948
 
          rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \
 
984
          echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
 
985
          rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
949
986
        done;
950
987
 
951
988
uninstall-doc-omf:
952
989
        @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
953
990
          if test "x$(_ENABLE_SK)" = "xtrue"; then \
954
 
            echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
955
 
            scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
 
991
            echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
 
992
            scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
956
993
          fi; \
957
 
          echo "rm -f $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
958
 
          rm -f "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
 
994
          echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
 
995
          rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
959
996
        done
960
997
dist-hook: doc-dist-hook
961
998
# ja zh_CN zh_HK zh_TW need to be transitioned to gnome-doc-utils