ec56c869d3
3.5.0:
* New alt-tab dialog shows windows in a vertical list.
* Improved Xinerama support.
* Allow icons in menus.
* Theme options for prompt dialogs (osd.button.unpressed.*,
osd.button.pressed.*, osd.button.focused.*)
* Addresses bug #4877, #4596, #4617, #4752, #4663, #4662, #4586, #2319,
#4341, #4519, #4543, #4503, #4355, #4072, #3702, #4284
* Lots of additional bug fixes and performance improvements.
75 lines
3.2 KiB
Text
75 lines
3.2 KiB
Text
$NetBSD: patch-aa,v 1.11 2011/08/06 17:09:04 wiz Exp $
|
|
|
|
Install config files into examples directory (and use CONF_FILES
|
|
to handle them).
|
|
|
|
--- Makefile.in.orig 2011-08-01 20:15:35.000000000 +0000
|
|
+++ Makefile.in
|
|
@@ -542,7 +542,7 @@ top_srcdir = @top_srcdir@
|
|
SUBDIRS = m4 po
|
|
docxbmdir = $(docdir)/xbm
|
|
themedir = $(datadir)/themes
|
|
-configdir = $(sysconfdir)/xdg
|
|
+configdir = $(sysconfdir)
|
|
rcdir = $(configdir)/openbox
|
|
xsessionsdir = $(datadir)/xsessions
|
|
gnomewmfilesdir = $(datadir)/gnome/wm-properties
|
|
@@ -1534,7 +1534,7 @@ uninstall-dist_libexecSCRIPTS:
|
|
cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
|
|
install-dist_rcSCRIPTS: $(dist_rc_SCRIPTS)
|
|
@$(NORMAL_INSTALL)
|
|
- test -z "$(rcdir)" || $(MKDIR_P) "$(DESTDIR)$(rcdir)"
|
|
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/examples/openbox
|
|
@list='$(dist_rc_SCRIPTS)'; test -n "$(rcdir)" || list=; \
|
|
for p in $$list; do \
|
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
@@ -1553,8 +1553,8 @@ install-dist_rcSCRIPTS: $(dist_rc_SCRIPT
|
|
while read type dir files; do \
|
|
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
|
|
test -z "$$files" || { \
|
|
- echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(rcdir)$$dir'"; \
|
|
- $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(rcdir)$$dir" || exit $$?; \
|
|
+ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(datadir)/examples/openbox/$$dir'"; \
|
|
+ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(datadir)/examples/openbox/$$dir" || exit $$?; \
|
|
} \
|
|
; done
|
|
|
|
@@ -1636,7 +1636,7 @@ uninstall-nodist_libexecSCRIPTS:
|
|
cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
|
|
install-nodist_rcSCRIPTS: $(nodist_rc_SCRIPTS)
|
|
@$(NORMAL_INSTALL)
|
|
- test -z "$(rcdir)" || $(MKDIR_P) "$(DESTDIR)$(rcdir)"
|
|
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/examples/openbox
|
|
@list='$(nodist_rc_SCRIPTS)'; test -n "$(rcdir)" || list=; \
|
|
for p in $$list; do \
|
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
@@ -1655,8 +1655,8 @@ install-nodist_rcSCRIPTS: $(nodist_rc_SC
|
|
while read type dir files; do \
|
|
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
|
|
test -z "$$files" || { \
|
|
- echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(rcdir)$$dir'"; \
|
|
- $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(rcdir)$$dir" || exit $$?; \
|
|
+ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(datadir)/examples/openbox/$$dir'"; \
|
|
+ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(datadir)/examples/openbox/$$dir" || exit $$?; \
|
|
} \
|
|
; done
|
|
|
|
@@ -3482,15 +3482,15 @@ uninstall-dist_pixmapDATA:
|
|
cd "$(DESTDIR)$(pixmapdir)" && rm -f $$files
|
|
install-dist_rcDATA: $(dist_rc_DATA)
|
|
@$(NORMAL_INSTALL)
|
|
- test -z "$(rcdir)" || $(MKDIR_P) "$(DESTDIR)$(rcdir)"
|
|
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/examples/openbox
|
|
@list='$(dist_rc_DATA)'; test -n "$(rcdir)" || list=; \
|
|
for p in $$list; do \
|
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
echo "$$d$$p"; \
|
|
done | $(am__base_list) | \
|
|
while read files; do \
|
|
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(rcdir)'"; \
|
|
- $(INSTALL_DATA) $$files "$(DESTDIR)$(rcdir)" || exit $$?; \
|
|
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(datadir)/examples/openbox'"; \
|
|
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(datadir)/examples/openbox" || exit $$?; \
|
|
done
|
|
|
|
uninstall-dist_rcDATA:
|