]>
Commit | Line | Data |
---|---|---|
210539f8 PG |
1 | --- ./po/Makefile.org Thu Oct 11 02:21:25 2001 |
2 | +++ ./po/Makefile Thu Oct 11 02:22:19 2001 | |
85c8808c PG |
3 | @@ -18,10 +18,10 @@ |
4 | all: $(MOFILES) | |
5 | ||
6 | install: all | |
210539f8 PG |
7 | - @echo Installing message catalogues in $(LOCDIR) |
8 | + @echo Installing message catalogues in $(DESTDIR)$(LOCDIR) | |
85c8808c | 9 | @for c in $(MOFILES); do \ |
c62f2d36 | 10 | LANG=`echo $$c|sed -e 's/.mo//'` ; \ |
85c8808c PG |
11 | - MSGDIR="$(LOCDIR)/$$LANG/LC_MESSAGES"; \ |
12 | + MSGDIR="$(DESTDIR)$(LOCDIR)/$$LANG/LC_MESSAGES"; \ | |
c62f2d36 | 13 | echo Installing language: $$LANG ; \ |
85c8808c PG |
14 | $(INSTALLDIR) $$MSGDIR; \ |
15 | $(INSTALLLIB) $$c $$MSGDIR/$(PACKAGE).mo; \ | |
210539f8 PG |
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 @@ | |
59c8708d | 19 | # Makefile TABS *SUCK* |
4d0661a9 | 20 | install-base: base |
21 | @echo ------------------------------------------ | |
210539f8 | 22 | - @echo "Installing binaries in $(BINDIR)" |
4d0661a9 | 23 | - @$(INSTALLDIR) $(BINDIR) |
210539f8 | 24 | + @echo "Installing binaries in $(DESTDIR)$(BINDIR)" |
4d0661a9 | 25 | + @$(INSTALLDIR) $(DESTDIR)$(BINDIR) |
ec15105f | 26 | @for app in $(BINFILES) ; do \ |
85c8808c PG |
27 | - $(INSTALLBIN) "$$app" $(BINDIR); \ |
28 | + $(INSTALLBIN) "$$app" $(DESTDIR)$(BINDIR); \ | |
4d0661a9 | 29 | done |
210539f8 | 30 | - @echo "Installing defaults, icons and themes in $(LIBDIR)" |
4d0661a9 | 31 | - @$(INSTALLDIR) $(LIBDIR) |
473dc2a8 | 32 | - @$(INSTALLDIR) $(CFGDIR) |
210539f8 | 33 | + @echo "Installing defaults, icons and themes in $(DESTDIR)$(LIBDIR)" |
4d0661a9 | 34 | + @$(INSTALLDIR) $(DESTDIR)$(LIBDIR) |
473dc2a8 | 35 | + @$(INSTALLDIR) $(DESTDIR)$(CFGDIR) |
4d0661a9 | 36 | @for lib in $(LIBFILES) ; do \ |
85c8808c PG |
37 | - $(INSTALLLIB) "$$lib" $(LIBDIR); \ |
38 | + $(INSTALLLIB) "$$lib" $(DESTDIR)$(LIBDIR); \ | |
4d0661a9 | 39 | done |
85c8808c PG |
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; \ | |
4d0661a9 | 49 | done |
210539f8 | 50 | @echo ------------------------------------------ |
4d0661a9 | 51 | @for theme in $(THEMES) ; do \ |
210539f8 | 52 | echo "Installing theme: $$theme"; \ |
4d0661a9 | 53 | - $(INSTALLDIR) $(LIBDIR)/themes/$$theme; \ |
54 | + $(INSTALLDIR) $(DESTDIR)$(LIBDIR)/themes/$$theme; \ | |
85c8808c PG |
55 | for pixmap in lib/themes/$$theme/*.xpm; do \ |
56 | - $(INSTALLLIB) "$$pixmap" $(LIBDIR)/themes/$$theme; \ | |
57 | + $(INSTALLLIB) "$$pixmap" $(DESTDIR)$(LIBDIR)/themes/$$theme; \ | |
4d0661a9 | 58 | done; \ |
85c8808c PG |
59 | for subtheme in lib/themes/$$theme/*.theme; do \ |
60 | - $(INSTALLLIB) "$$subtheme" $(LIBDIR)/themes/$$theme; \ | |
61 | + $(INSTALLLIB) "$$subtheme" $(DESTDIR)$(LIBDIR)/themes/$$theme; \ | |
4d0661a9 | 62 | done; \ |
85c8808c PG |
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 \ | |
210539f8 PG |
69 | - cwd=$$PWD; cd "$(LIBDIR)/themes/$$theme"; \ |
70 | + cwd=$$PWD; cd "$(DESTDIR)$(LIBDIR)/themes/$$theme"; \ | |
85c8808c | 71 | $(MKFONTDIR); \ |
210539f8 | 72 | cd $$cwd; \ |
85c8808c PG |
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"; \ | |
210539f8 | 81 | + $(INSTALLLIB) "$(DESTDIR)/lib/themes/$$theme/fonts.dir.default" \ |
85c8808c PG |
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; \ | |
4d0661a9 | 92 | done;\ |
93 | fi;\ | |
94 | done;\ | |
210539f8 | 95 | @@ -130,11 +130,11 @@ |
473dc2a8 | 96 | |
59c8708d | 97 | install-docs: docs $(LSM) |
473dc2a8 | 98 | @echo ------------------------------------------ |
85c8808c | 99 | - @rm -fr $(DOCDIR)/icewm-$(VERSION) |
4d0661a9 | 100 | - @$(INSTALLDIR) $(DOCDIR)/icewm-$(VERSION) |
85c8808c PG |
101 | - @echo Installing documentation in $(DOCDIR); \ |
102 | - cp $(DOCFILES) $(DOCDIR)/icewm-$(VERSION); \ | |
210539f8 | 103 | - cp -r doc/*.sgml doc/*.html $(DOCDIR)/icewm-$(VERSION) |
85c8808c | 104 | + @rm -fr $(DESTDIR)$(DOCDIR)/icewm-$(VERSION) |
473dc2a8 | 105 | + @$(INSTALLDIR) $(DESTDIR)$(DOCDIR)/icewm-$(VERSION) |
85c8808c PG |
106 | + @echo Installing documentation in $(DESTDIR)$(DOCDIR); \ |
107 | + cp $(DOCFILES) $(DESTDIR)$(DOCDIR)/icewm-$(VERSION); \ | |
210539f8 | 108 | + cp -r doc/*.sgml doc/*.html $(DESTDIR)$(DOCDIR)/icewm-$(VERSION) |
4d0661a9 | 109 | @echo ------------------------------------------ |
4d0661a9 | 110 | |
210539f8 PG |
111 | install-nls: nls |
112 | @@ -144,7 +144,7 @@ | |
473dc2a8 AM |
113 | |
114 | install-gnome: gnome | |
115 | @echo ------------------------------------------ | |
85c8808c | 116 | - @echo Installing icewm-gnome in $(WMPROPDIR) |
473dc2a8 AM |
117 | - @$(INSTALLDIR) $(WMPROPDIR) |
118 | - @$(INSTALLLIB) lib/IceWM.desktop $(WMPROPDIR) | |
85c8808c | 119 | + @echo Installing icewm-gnome in $(DESTDIR)$(WMPROPDIR) |
473dc2a8 AM |
120 | + @$(INSTALLDIR) $(DESTDIR)$(WMPROPDIR) |
121 | + @$(INSTALLLIB) lib/IceWM.desktop $(DESTDIR)$(WMPROPDIR) | |
210539f8 PG |
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 @@ | |
4d0661a9 | 126 | AC_FUNC_SELECT_ARGTYPES |
127 | ||
128 | dnl Configuring features | |
129 | -TARGETS='base docs' | |
130 | +TARGETS='base' | |
210539f8 | 131 | APPLICATIONS='genpref icewm icesh icewmhint icewmbg' |
4d0661a9 | 132 | |
133 | dnl Checking for X11 |