summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2011-04-08 21:36:11 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2011-04-12 18:18:39 -0700
commit7103b83a88edb9c93acfa68f3b556595b087baff (patch)
treeeac733f806ea065af4d732f1043be923282f29ae
parent9a1ae7a90f815a737a942e42d5eb1ffff400977b (diff)
Make doc install subdirectories more like the pre-docbook.am paths
Haven't restored the "specs" path in the install path, but have restored libX11 & i18n subdirectories in the path for better logical grouping. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r--specs/i18n/framework/Makefile.am2
-rw-r--r--specs/i18n/localedb/Makefile.am2
-rw-r--r--specs/i18n/trans/Makefile.am2
-rw-r--r--specs/libX11/Makefile.am2
4 files changed, 4 insertions, 4 deletions
diff --git a/specs/i18n/framework/Makefile.am b/specs/i18n/framework/Makefile.am
index 350b7df..af7ae1d 100644
--- a/specs/i18n/framework/Makefile.am
+++ b/specs/i18n/framework/Makefile.am
@@ -8,7 +8,7 @@ docbook = framework.xml
chapters = framework.svg
# The location where the DocBook/XML files and their generated formats are installed
-shelfdir = $(docdir)/framework
+shelfdir = $(docdir)/i18n/framework
# Generate DocBook/XML output formats with or without stylesheets
include $(top_srcdir)/docbook.am
diff --git a/specs/i18n/localedb/Makefile.am b/specs/i18n/localedb/Makefile.am
index 0c52a13..68a917c 100644
--- a/specs/i18n/localedb/Makefile.am
+++ b/specs/i18n/localedb/Makefile.am
@@ -5,7 +5,7 @@ if ENABLE_SPECS
docbook = localedb.xml
# The location where the DocBook/XML files and their generated formats are installed
-shelfdir = $(docdir)/localedb
+shelfdir = $(docdir)/i18n/localedb
# Generate DocBook/XML output formats with or without stylesheets
include $(top_srcdir)/docbook.am
diff --git a/specs/i18n/trans/Makefile.am b/specs/i18n/trans/Makefile.am
index 6e4baf1..40a135a 100644
--- a/specs/i18n/trans/Makefile.am
+++ b/specs/i18n/trans/Makefile.am
@@ -5,7 +5,7 @@ if ENABLE_SPECS
docbook = trans.xml
# The location where the DocBook/XML files and their generated formats are installed
-shelfdir = $(docdir)/trans
+shelfdir = $(docdir)/i18n/trans
# Generate DocBook/XML output formats with or without stylesheets
include $(top_srcdir)/docbook.am
diff --git a/specs/libX11/Makefile.am b/specs/libX11/Makefile.am
index c4de67e..b87e568 100644
--- a/specs/libX11/Makefile.am
+++ b/specs/libX11/Makefile.am
@@ -30,7 +30,7 @@ chapters = \
glossary.xml
# The location where the DocBook/XML files and their generated formats are installed
-shelfdir = $(docdir)
+shelfdir = $(docdir)/libX11
# Generate DocBook/XML output formats with or without stylesheets
include $(top_srcdir)/docbook.am