]>
Commit | Line | Data |
---|---|---|
1 | --- ./po/Makefile.org Thu Oct 11 02:21:25 2001 | |
2 | +++ ./po/Makefile Thu Oct 11 02:22:19 2001 | |
3 | @@ -18,10 +18,10 @@ | |
4 | all: $(MOFILES) | |
5 | ||
6 | install: all | |
7 | - @echo Installing message catalogues in $(LOCDIR) | |
8 | + @echo Installing message catalogues in $(DESTDIR)$(LOCDIR) | |
9 | @for c in $(MOFILES); do \ | |
10 | LANG=`echo $$c|sed -e 's/.mo//'` ; \ | |
11 | - MSGDIR="$(LOCDIR)/$$LANG/LC_MESSAGES"; \ | |
12 | + MSGDIR="$(DESTDIR)$(LOCDIR)/$$LANG/LC_MESSAGES"; \ | |
13 | echo Installing language: $$LANG ; \ | |
14 | $(INSTALLDIR) $$MSGDIR; \ | |
15 | $(INSTALLLIB) $$c $$MSGDIR/$(PACKAGE).mo; \ | |
16 | --- ./Makefile.in.org Thu Oct 11 02:22:32 2001 | |
17 | +++ ./Makefile.in Thu Oct 11 02:27:57 2001 | |
18 | @@ -70,57 +70,57 @@ | |
19 | # Makefile TABS *SUCK* | |
20 | install-base: base | |
21 | @echo ------------------------------------------ | |
22 | - @echo "Installing binaries in $(BINDIR)" | |
23 | - @$(INSTALLDIR) $(BINDIR) | |
24 | + @echo "Installing binaries in $(DESTDIR)$(BINDIR)" | |
25 | + @$(INSTALLDIR) $(DESTDIR)$(BINDIR) | |
26 | @for app in $(BINFILES) ; do \ | |
27 | - $(INSTALLBIN) "$$app" $(BINDIR); \ | |
28 | + $(INSTALLBIN) "$$app" $(DESTDIR)$(BINDIR); \ | |
29 | done | |
30 | - @echo "Installing defaults, icons and themes in $(LIBDIR)" | |
31 | - @$(INSTALLDIR) $(LIBDIR) | |
32 | - @$(INSTALLDIR) $(CFGDIR) | |
33 | + @echo "Installing defaults, icons and themes in $(DESTDIR)$(LIBDIR)" | |
34 | + @$(INSTALLDIR) $(DESTDIR)$(LIBDIR) | |
35 | + @$(INSTALLDIR) $(DESTDIR)$(CFGDIR) | |
36 | @for lib in $(LIBFILES) ; do \ | |
37 | - $(INSTALLLIB) "$$lib" $(LIBDIR); \ | |
38 | + $(INSTALLLIB) "$$lib" $(DESTDIR)$(LIBDIR); \ | |
39 | done | |
40 | @for xpmdir in $(XPMDIRS); do \ | |
41 | if test -d lib/$$xpmdir; then \ | |
42 | - $(INSTALLDIR) $(LIBDIR)/$$xpmdir; \ | |
43 | + $(INSTALLDIR) $(DESTDIR)$(LIBDIR)/$$xpmdir; \ | |
44 | for pixmap in lib/$$xpmdir/*.xpm ; do \ | |
45 | - $(INSTALLLIB) "$$pixmap" $(LIBDIR)/$$xpmdir; \ | |
46 | + $(INSTALLLIB) "$$pixmap" $(DESTDIR)$(LIBDIR)/$$xpmdir; \ | |
47 | done; \ | |
48 | fi; \ | |
49 | done | |
50 | @echo ------------------------------------------ | |
51 | @for theme in $(THEMES) ; do \ | |
52 | echo "Installing theme: $$theme"; \ | |
53 | - $(INSTALLDIR) $(LIBDIR)/themes/$$theme; \ | |
54 | + $(INSTALLDIR) $(DESTDIR)$(LIBDIR)/themes/$$theme; \ | |
55 | for pixmap in lib/themes/$$theme/*.xpm; do \ | |
56 | - $(INSTALLLIB) "$$pixmap" $(LIBDIR)/themes/$$theme; \ | |
57 | + $(INSTALLLIB) "$$pixmap" $(DESTDIR)$(LIBDIR)/themes/$$theme; \ | |
58 | done; \ | |
59 | for subtheme in lib/themes/$$theme/*.theme; do \ | |
60 | - $(INSTALLLIB) "$$subtheme" $(LIBDIR)/themes/$$theme; \ | |
61 | + $(INSTALLLIB) "$$subtheme" $(DESTDIR)$(LIBDIR)/themes/$$theme; \ | |
62 | done; \ | |
63 | if test -f lib/themes/$$theme/*.pcf; then \ | |
64 | for fontfile in lib/themes/$$theme/*.pcf; do \ | |
65 | - $(INSTALLLIB) "$$fontfile" $(LIBDIR)/themes/$$theme; \ | |
66 | + $(INSTALLLIB) "$$fontfile" $(DESTDIR)$(LIBDIR)/themes/$$theme; \ | |
67 | done; \ | |
68 | if test -x "$(MKFONTDIR)"; then \ | |
69 | - cwd=$$PWD; cd "$(LIBDIR)/themes/$$theme"; \ | |
70 | + cwd=$$PWD; cd "$(DESTDIR)$(LIBDIR)/themes/$$theme"; \ | |
71 | $(MKFONTDIR); \ | |
72 | cd $$cwd; \ | |
73 | else \ | |
74 | echo "WARNING: A dummy file has been copied to"; \ | |
75 | - echo " $(LIBDIR)/themes/$$theme/fonts.dir"; \ | |
76 | + echo " $(DESTDIR)$(LIBDIR)/themes/$$theme/fonts.dir"; \ | |
77 | echo " You better setup your path to point to mkfontdir or use the"; \ | |
78 | echo " --with-mkfontdir option of the configure script."; \ | |
79 | - $(INSTALLLIB) "lib/themes/$$theme/fonts.dir.default" \ | |
80 | - "$(LIBDIR)/themes/$$theme/fonts.dir"; \ | |
81 | + $(INSTALLLIB) "$(DESTDIR)/lib/themes/$$theme/fonts.dir.default" \ | |
82 | + "$(DESTDIR)$(LIBDIR)/themes/$$theme/fonts.dir"; \ | |
83 | fi; \ | |
84 | fi; \ | |
85 | for xpmdir in $(XPMDIRS) ; do \ | |
86 | if [ -d lib/themes/$$theme/$$xpmdir ] ; then \ | |
87 | - $(INSTALLDIR) $(LIBDIR)/themes/$$theme/$$xpmdir; \ | |
88 | + $(INSTALLDIR) $(DESTDIR)$(LIBDIR)/themes/$$theme/$$xpmdir; \ | |
89 | for f in lib/themes/$$theme/$$xpmdir/*.xpm ; do \ | |
90 | - $(INSTALLLIB) "$$f" $(LIBDIR)/themes/$$theme/$$xpmdir; \ | |
91 | + $(INSTALLLIB) "$$f" $(DESTDIR)$(LIBDIR)/themes/$$theme/$$xpmdir; \ | |
92 | done;\ | |
93 | fi;\ | |
94 | done;\ | |
95 | @@ -130,11 +130,11 @@ | |
96 | ||
97 | install-docs: docs $(LSM) | |
98 | @echo ------------------------------------------ | |
99 | - @rm -fr $(DOCDIR)/icewm-$(VERSION) | |
100 | - @$(INSTALLDIR) $(DOCDIR)/icewm-$(VERSION) | |
101 | - @echo Installing documentation in $(DOCDIR); \ | |
102 | - cp $(DOCFILES) $(DOCDIR)/icewm-$(VERSION); \ | |
103 | - cp -r doc/*.sgml doc/*.html $(DOCDIR)/icewm-$(VERSION) | |
104 | + @rm -fr $(DESTDIR)$(DOCDIR)/icewm-$(VERSION) | |
105 | + @$(INSTALLDIR) $(DESTDIR)$(DOCDIR)/icewm-$(VERSION) | |
106 | + @echo Installing documentation in $(DESTDIR)$(DOCDIR); \ | |
107 | + cp $(DOCFILES) $(DESTDIR)$(DOCDIR)/icewm-$(VERSION); \ | |
108 | + cp -r doc/*.sgml doc/*.html $(DESTDIR)$(DOCDIR)/icewm-$(VERSION) | |
109 | @echo ------------------------------------------ | |
110 | ||
111 | install-nls: nls | |
112 | @@ -144,7 +144,7 @@ | |
113 | ||
114 | install-gnome: gnome | |
115 | @echo ------------------------------------------ | |
116 | - @echo Installing icewm-gnome in $(WMPROPDIR) | |
117 | - @$(INSTALLDIR) $(WMPROPDIR) | |
118 | - @$(INSTALLLIB) lib/IceWM.desktop $(WMPROPDIR) | |
119 | + @echo Installing icewm-gnome in $(DESTDIR)$(WMPROPDIR) | |
120 | + @$(INSTALLDIR) $(DESTDIR)$(WMPROPDIR) | |
121 | + @$(INSTALLLIB) lib/IceWM.desktop $(DESTDIR)$(WMPROPDIR) | |
122 | @echo ------------------------------------------ | |
123 | --- ./configure.in.org Thu Oct 11 02:28:10 2001 | |
124 | +++ ./configure.in Thu Oct 11 02:28:32 2001 | |
125 | @@ -83,7 +83,7 @@ | |
126 | AC_FUNC_SELECT_ARGTYPES | |
127 | ||
128 | dnl Configuring features | |
129 | -TARGETS='base docs' | |
130 | +TARGETS='base' | |
131 | APPLICATIONS='genpref icewm icesh icewmhint icewmbg' | |
132 | ||
133 | dnl Checking for X11 |