]> git.pld-linux.org Git - packages/emacspeak.git/blame - emacspeak-Makefile.patch
projects / packages / emacspeak.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- invoke fix-info-dir via /sbin/postshell where possible to avoid extra /bin/sh dep
[packages/emacspeak.git] / emacspeak-Makefile.patch
CommitLineData
176d893c 1diff -Nur p0/Makefile p1/Makefile
2--- p0/Makefile 2006-05-03 04:54:05.000000000 +0200
3+++ p1/Makefile 2006-09-17 11:10:24.000000000 +0200
4@@ -122,13 +122,15 @@
5 ##### Site Configuration #####
6 MAKE=make
7 prefix = /usr
8+datadir = $(prefix)/share
9 # where executables go
10 bindir = ${prefix}/bin
11 # where info files should go
12-infodir = ${prefix}/share/info
13+infodir = $(datadir)/info
14+mandir = $(datadir)/man
15 # where the emacspeak library directory should go
16 #for older emacsuns use /usr/lib
17-libparentdir = ${prefix}/share/emacs/site-lisp
18+libparentdir = $(datadir)/emacs/site-lisp
19 # where all emacspeak files should go
20 libdir =$(libparentdir)/emacspeak
21 #directory where we are building
22@@ -244,53 +246,56 @@
23
24 install:
25 $(MAKE) config SRC=$(libdir)
26- $(INSTALL) -d $(libparentdir)
27- $(INSTALL) -d $(libdir)
28- touch $(libdir)/.nosearch
29- $(INSTALL) -d $(libdir)/lisp
30- $(INSTALL) -d $(libdir)/lisp/xml-forms
31- $(INSTALL) -d $(libdir)/lisp/atom-blogger
32- $(INSTALL) -d $(libdir)/etc
33- $(INSTALL) -d $(libdir)/sawfish
34- $(INSTALL) -d $(libdir)/xsl
35- $(INSTALL) -d $(libdir)/user-guide
36- $(INSTALL) -d $(libdir)/install-guide
37- $(INSTALL) -m 0644 lisp/*.el lisp/*.elc $(libdir)/lisp
38- $(INSTALL) -m 0644 lisp/xml-forms/*.xml $(libdir)/lisp/xml-forms
39- $(INSTALL) -m 0644 lisp/atom-blogger/*.el $(libdir)/lisp/atom-blogger
40- $(INSTALL) -m 0644 lisp/atom-blogger/*.xsl $(libdir)/lisp/atom-blogger
41- $(INSTALL) -m 0644 sawfish/*.jl sawfish/sawfishrc $(libdir)/sawfish
42- $(INSTALL) -m 0644 xsl/*.xsl $(libdir)/xsl
43- $(INSTALL) -m 0644 ${UGUIDE} $(libdir)/user-guide
44- $(INSTALL) -m 0644 ${IGUIDE} $(libdir)/install-guide
45- $(INSTALL) -d $(libdir)/sounds
46- $(INSTALL) -d $(libdir)/servers
47- $(INSTALL) -d $(libdir)/servers/linux-outloud
48- $(INSTALL) -m 755 ${OUTLOUD} $(libdir)/servers/linux-outloud
49- $(INSTALL) -d $(libdir)/servers/software-dtk
50- $(INSTALL) -m 755 ${DTKTTS} $(libdir)/servers/software-dtk
51- $(INSTALL) -m 755 ${TCL_PROGRAMS} $(libdir)/servers
52- $(INSTALL) -m 0644 ${NEWS} $(libdir)/etc
53- cp ${MISC} $(libdir)/etc
54- $(CP) -r $(SOUNDS) $(libdir)/sounds
55- chmod -R go+rX $(libdir)/sounds
56- $(CP) -r $(REALAUDIO) $(libdir)
57- chmod -R go+rX $(libdir)/realaudio
58- $(CP) -r $(SHOUTCAST) $(libdir)
59- chmod -R go+rX $(libdir)/shoutcast
60- $(INSTALL) -d $(libdir)/etc/forms
61- $(INSTALL) -m 0644 $(FORMS) $(libdir)/etc/forms
62- $(INSTALL) -d $(libdir)/etc/tables
63- $(INSTALL) -m 0644 $(TABLE_SAMPLES) $(libdir)/etc/tables
64- $(INSTALL) -d $(bindir)
65- $(INSTALL) -m 0755 etc/emacspeak.sh $(bindir)/emacspeak
66- $(INSTALL) -d $(infodir)
67- cd info; \
68- $(MAKE) install infodir=$(infodir)
69+ $(INSTALL) -d $(DESTDIR)$(libparentdir)
70+ $(INSTALL) -d $(DESTDIR)$(libdir)
71+ touch $(DESTDIR)$(libdir)/.nosearch
72+ $(INSTALL) -d $(DESTDIR)$(libdir)/lisp
73+ $(INSTALL) -d $(DESTDIR)$(libdir)/lisp/xml-forms
74+ $(INSTALL) -d $(DESTDIR)$(libdir)/lisp/atom-blogger
75+ $(INSTALL) -d $(DESTDIR)$(libdir)/etc
76+ $(INSTALL) -d $(DESTDIR)$(libdir)/sawfish
77+ $(INSTALL) -d $(DESTDIR)$(libdir)/xsl
78+ $(INSTALL) -d $(DESTDIR)$(libdir)/user-guide
79+ $(INSTALL) -d $(DESTDIR)$(libdir)/install-guide
80+ $(INSTALL) -d $(DESTDIR)$(libdir)/blurbs
81+ $(INSTALL) -d $(DESTDIR)$(infodir)
82+ $(INSTALL) -d $(DESTDIR)$(mandir)/man1
83+ $(INSTALL) -m 0644 lisp/*.el lisp/*.elc $(DESTDIR)$(libdir)/lisp
84+ $(INSTALL) -m 0644 lisp/xml-forms/*.xml $(DESTDIR)$(libdir)/lisp/xml-forms
85+ $(INSTALL) -m 0644 lisp/atom-blogger/*.el $(DESTDIR)$(libdir)/lisp/atom-blogger
86+ $(INSTALL) -m 0644 lisp/atom-blogger/*.xsl $(DESTDIR)$(libdir)/lisp/atom-blogger
87+ $(INSTALL) -m 0644 sawfish/*.jl sawfish/sawfishrc $(DESTDIR)$(libdir)/sawfish
88+ $(INSTALL) -m 0644 xsl/*.xsl $(DESTDIR)$(libdir)/xsl
89+ $(INSTALL) -m 0644 ${UGUIDE} $(DESTDIR)$(libdir)/user-guide
90+ $(INSTALL) -m 0644 ${IGUIDE} $(DESTDIR)$(libdir)/install-guide
91+ $(INSTALL) -m 0644 debian/*.blurb $(DESTDIR)$(libdir)/blurbs
92+ $(INSTALL) -d $(DESTDIR)$(libdir)/sounds
93+ $(INSTALL) -d $(DESTDIR)$(libdir)/servers
94+ $(INSTALL) -d $(DESTDIR)$(libdir)/servers/linux-outloud
95+ $(INSTALL) -m 755 ${OUTLOUD} $(DESTDIR)$(libdir)/servers/linux-outloud
96+ $(INSTALL) -d $(DESTDIR)$(libdir)/servers/software-dtk
97+ $(INSTALL) -m 755 ${DTKTTS} $(DESTDIR)$(libdir)/servers/software-dtk
98+ $(INSTALL) -m 755 ${TCL_PROGRAMS} $(DESTDIR)$(libdir)/servers
99+ $(INSTALL) -m 0644 ${NEWS} $(DESTDIR)$(libdir)/etc
100+ cp ${MISC} $(DESTDIR)$(libdir)/etc
101+ $(CP) -r $(SOUNDS) $(DESTDIR)$(libdir)/sounds
102+ chmod -R go+rX $(DESTDIR)$(libdir)/sounds
103+ $(CP) -r $(REALAUDIO) $(DESTDIR)$(libdir)
104+ chmod -R go+rX $(DESTDIR)$(libdir)/realaudio
105+ $(CP) -r $(SHOUTCAST) $(DESTDIR)$(libdir)
106+ chmod -R go+rX $(DESTDIR)$(libdir)/shoutcast
107+ $(INSTALL) -d $(DESTDIR)$(libdir)/etc/forms
108+ $(INSTALL) -m 0644 $(FORMS) $(DESTDIR)$(libdir)/etc/forms
109+ $(INSTALL) -d $(DESTDIR)$(libdir)/etc/tables
110+ $(INSTALL) -m 0644 $(TABLE_SAMPLES) $(DESTDIR)$(libdir)/etc/tables
111+ $(INSTALL) -d $(DESTDIR)$(bindir)
112+ $(INSTALL) -m 0755 etc/emacspeak.sh $(DESTDIR)$(bindir)/emacspeak
113+ $(INSTALL) -m644 debian/*.1 $(DESTDIR)$(mandir)/man1
114+ $(MAKE) -C info install infodir=$(DESTDIR)$(infodir)
115
116 uninstall:
117- rm -rf $(infodir)/emacspeak.info* $(bindir)/emacspeak
118- rm -rf $(libdir)
119+ rm -rf $(DESTDIR)$(infodir)/emacspeak.info* $(DESTDIR)$(bindir)/emacspeak
120+ rm -rf $(DESTDIR)$(libdir)
121
122
123 # }}}
124diff -Nur p0/info/Makefile p1/info/Makefile
125--- p0/info/Makefile 2006-05-03 04:54:04.000000000 +0200
126+++ p1/info/Makefile 2006-09-17 11:10:24.000000000 +0200
127@@ -3,11 +3,11 @@
128 HTML_FILES=$(shell find . -name '*.html' -print)
129 TEXINDEX=texindex
130 FILES=*.texi
131-MAKEINFO = makeinfo
132+MAKEINFO = makeinfo --no-split --fill-column=70
133 TEX=tex
134 PDFTEX=pdftex
135 TEXI2HTML=texi2html
136-infodir =/usr/share/info#normally supplied by caller
137+INFODIR = /usr/share/info
138 INSTALL = install
139 EMACS=emacs
140
141@@ -27,16 +27,17 @@
142 $(EMACS) -batch -q -l ../utils/document-commands.el
143
144 install: emacspeak.info
145- if test -x /sbin/install-info ; then \
146- install-info emacspeak.info /etc/info-dir; \
147- fi
148- $(INSTALL) -m 644 *.info* $(infodir)
149+ $(INSTALL) -d $(DESTDIR)$(INFODIR)
150+ #/usr/sbin/install-info emacspeak.info $(DESTDIR)$(INFODIR)
151+ #/usr/sbin/install-info emacspeak.info /mnt/hda5/tmp/emacspeak-24-root-inter/usr/share/info
152+ #install-info: /mnt/hda5/tmp/emacspeak-24-root-inter/usr/share/info: empty file -- wtf?
153+ install emacspeak.info* $(DESTDIR)$(INFODIR)
154+ $(INSTALL) -m 644 emacspeak.info* $(DESTDIR)$(INFODIR)
155
156 uninstall:
157- if test -e /sbin/install-info ; then \
158- install-info --delete $(infodir)/*.info /etc/info-dir; \
159- fi
160- rm -f $(infodir)/*.info*
161+ /usr/sbin/install-info --delete $(DESTDIR)$(INFODIR)/emacspeak.info* $(DESTDIR)$(INFODIR)
162+ rm -f $(DESTDIR)$(INFODIR)/emacspeak.info*
163+
164 emacspeak.info: emacspeak.texi
165
166 introducing-emacspeak.info: introducing-emacspeak.texi
167diff -Nur p0/servers/linux-outloud/Makefile p1/servers/linux-outloud/Makefile
168--- p0/servers/linux-outloud/Makefile 2006-05-03 04:54:04.000000000 +0200
169+++ p1/servers/linux-outloud/Makefile 2006-09-17 11:10:24.000000000 +0200
170@@ -30,6 +30,6 @@
171 rm -f tcleci.so tcleci.o tcleci.lo
172
173 install: tcleci.so
174- if test ! -d $(libdir) ; then mkdir $(libdir); fi ; \
175- chmod 755 $(libdir); \
176- $(INSTALL) -m 0644 $(TTS) $(ATTS) $(libdir)
177+ if test ! -d $(DESTDIR)$(libdir) ; then mkdir $(DESTDIR)$(libdir); fi ; \
178+ chmod 755 $(DESTDIR)$(libdir); \
179+ $(INSTALL) -m 0644 $(TTS) $(ATTS) $(DESTDIR)$(libdir)
180diff -Nur p0/servers/software-dtk/Makefile p1/servers/software-dtk/Makefile
181--- p0/servers/software-dtk/Makefile 2006-05-03 04:54:04.000000000 +0200
182+++ p1/servers/software-dtk/Makefile 2006-09-17 11:10:24.000000000 +0200
183@@ -30,8 +30,8 @@
184 rm tcldtk.so tcldtk.o
185
186 install:
187- $(INSTALL) -d $(SERVER_DIR)
188- cp $(FILES) $(SERVER_DIR)
189+ $(INSTALL) -d $(DESTDIR)$(SERVER_DIR)
190+ cp $(FILES) $(DESTDIR)$(SERVER_DIR)
191
192 rpm: software-dtk.spec software-dtk.tar.gz
193 @cp software-dtk.tar.gz /usr/src/redhat/SOURCES/
Emacspeak - speech output interface to Emacs
This page took 0.086618 seconds and 4 git commands to generate.