1 --- bless-0.4.0/src/Makefile.am.orig 2006-02-05 17:04:26.000000000 +0100
2 +++ bless-0.4.0/src/Makefile.am 2006-02-05 17:05:17.000000000 +0100
4 sed -e 's,@blesslibdir\@,$(libdir),g' bless-script > bless
6 install-exec-local: bless.exe
7 - $(INSTALL) -d $(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/bin
8 - $(INSTALL_DATA) bless.exe $(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/bin
9 - $(INSTALL) -d $(bindir)
10 - $(INSTALL_SCRIPT) bless $(bindir)
11 + $(INSTALL) -d $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/bin
12 + $(INSTALL_DATA) bless.exe $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/bin
13 + $(INSTALL) -d $(DESTDIR)$(bindir)
14 + $(INSTALL_SCRIPT) bless $(DESTDIR)$(bindir)
17 rm -rf $(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/bin
18 --- bless-0.4.0/doc/user/Makefile.am.orig 2006-02-05 17:08:51.000000000 +0100
19 +++ bless-0.4.0/doc/user/Makefile.am 2006-02-05 17:09:47.000000000 +0100
21 cp --parents $(DOCS) $(OMF).in $(wildcard *.html) $(FIGURES) $(distdir)
24 - $(INSTALL) -d $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user
25 - $(INSTALL) -d $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/figures
26 - $(INSTALL_DATA) $(DOCS) $(wildcard *.html) $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user
27 - $(INSTALL_DATA) $(FIGURES) $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/figures
28 - $(INSTALL) -d $(datadir)/omf/$(PACKAGE_NAME)
29 - $(INSTALL_DATA) $(OMF) $(datadir)/omf/$(PACKAGE_NAME)
30 + $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user
31 + $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/figures
32 + $(INSTALL_DATA) $(DOCS) $(wildcard *.html) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user
33 + $(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/figures
34 + $(INSTALL) -d $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
35 + $(INSTALL_DATA) $(OMF) $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
37 - scrollkeeper-update -o $(datadir)/omf/$(PACKAGE_NAME)
38 + scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
42 --- bless-0.4.0/doc/developer/Makefile.am.orig 2005-05-03 23:42:46.000000000 +0200
43 +++ bless-0.4.0/doc/developer/Makefile.am 2006-02-05 17:16:58.000000000 +0100
48 - $(INSTALL) -d $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/developer
49 - $(INSTALL_DATA) $(DOCS) $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/developer
50 + $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/developer
51 + $(INSTALL_DATA) $(DOCS) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/developer
54 rm -rf $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/developer
55 --- bless-0.4.0/data/Makefile.am.orig 2006-02-05 17:17:47.000000000 +0100
56 +++ bless-0.4.0/data/Makefile.am 2006-02-05 17:18:05.000000000 +0100
58 sed -e 's,@blessdocdir\@,$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION),g' help_script.tmpl > help_script.sh.install
61 - $(INSTALL) -d $(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/data
62 + $(INSTALL) -d $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/data
63 $(INSTALL_DATA) bless-about.png bless-48x48.png bless-default.layout \
64 bless-16-bytes-per-row.layout bless-all-number-bases.layout \
65 default-preferences.xml \
66 - $(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/data
67 - $(INSTALL) -d $(datadir)/applications
68 - $(INSTALL_DATA) bless.desktop $(datadir)/applications
69 - $(INSTALL) -d $(datadir)/pixmaps
70 - $(INSTALL_DATA) bless-48x48.png $(datadir)/pixmaps
71 - $(INSTALL_SCRIPT) help_script.sh.install $(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/data/help_script.sh
72 + $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/data
73 + $(INSTALL) -d $(DESTDIR)$(datadir)/applications
74 + $(INSTALL_DATA) bless.desktop $(DESTDIR)$(datadir)/applications
75 + $(INSTALL) -d $(DESTDIR)$(datadir)/pixmaps
76 + $(INSTALL_DATA) bless-48x48.png $(DESTDIR)$(datadir)/pixmaps
77 + $(INSTALL_SCRIPT) help_script.sh.install $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/data/help_script.sh
80 rm -rf $(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/data
81 --- bless-0.4.0/Makefile.am.orig 2006-02-05 17:25:20.000000000 +0100
82 +++ bless-0.4.0/Makefile.am 2006-02-05 17:25:45.000000000 +0100
84 tla changelog > $(distdir)/ChangeLog
87 - $(INSTALL) -d $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
88 - $(INSTALL_DATA) AUTHORS COPYING INSTALL ChangeLog NEWS README README.packaging bless.spec $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
89 + $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
92 rm -rf $(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
93 --- bless-0.4.0/doc/user/Makefile.am.orig 2006-02-05 18:22:44.000000000 +0100
94 +++ bless-0.4.0/doc/user/Makefile.am 2006-02-05 18:24:51.000000000 +0100
98 if [ -x `which scrollkeeper-preinstall` ]; then \
99 - scrollkeeper-preinstall file:$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/bless-manual.xml $(OMF).in $(OMF); \
100 + scrollkeeper-preinstall file:$(datadir)/gnome/help/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/C/bless-manual.xml $(OMF).in $(OMF); \
102 cp $(OMF).in $(OMF); \
105 cp --parents $(DOCS) $(OMF).in $(wildcard *.html) $(FIGURES) $(distdir)
108 - $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user
109 - $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/figures
110 - $(INSTALL_DATA) $(DOCS) $(wildcard *.html) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user
111 - $(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/figures
112 + $(INSTALL) -d $(DESTDIR)$(datadir)/gnome/help/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/C
113 + $(INSTALL) -d $(DESTDIR)$(datadir)/gnome/help/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/C/figures
114 + $(INSTALL_DATA) $(DOCS) $(wildcard *.html) $(DESTDIR)$(datadir)/gnome/help/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/C
115 + $(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(datadir)/gnome/help/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/C/figures
116 $(INSTALL) -d $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
117 $(INSTALL_DATA) $(OMF) $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
119 --- bless-0.4.0/data/Makefile.am.orig 2006-02-05 18:34:02.000000000 +0100
120 +++ bless-0.4.0/data/Makefile.am 2006-02-05 18:34:24.000000000 +0100
122 help_script.sh: help_script.tmpl
123 sed -e 's,@blessdocdir\@,$(PWD)/../doc,g' help_script.tmpl > help_script.sh
124 chmod +x help_script.sh
125 - sed -e 's,@blessdocdir\@,$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION),g' help_script.tmpl > help_script.sh.install
126 + sed -e 's,@blessdocdir\@,$(datadir)/gnome/help/$(PACKAGE_NAME)-$(PACKAGE_VERSION),g' help_script.tmpl > help_script.sh.install
129 $(INSTALL) -d $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/data
130 --- bless-0.4.0/data/help_script.tmpl.in.orig 2006-02-05 18:32:22.000000000 +0100
131 +++ bless-0.4.0/data/help_script.tmpl.in 2006-02-05 18:32:42.000000000 +0100
135 # Script that loads help for Bless
136 -xml_help="@blessdocdir@/user/bless-manual.xml"
137 -html_help="@blessdocdir@/user/index.html"
138 +xml_help="@blessdocdir@/C/bless-manual.xml"
139 +html_help="@blessdocdir@/C/index.html"
141 # try to get default browsers from GConf
142 GCONFTOOL=`which gconftool-2 2> /dev/null`