mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-19 12:28:22 +01:00
3140c09240
The default configuration options are given in two places in the source code: - src/default.c - WindowMaker/Defaults/WindowMaker.in The defaults are initially set in the former, but are then overwritten by the latter. Ideally, the default options in these two locations should coincide. However, there are currently several issues. - Many of the options are missing from WindowMaker/Defaults/WindowMaker.in - Many of the options have conflicting defaults between the two locations. - A number of options given in WindowMaker/Defaults/WindowMaker.in no longer exist. In this patch, we bring the defaults in the two locations in line with one another. We have given preference to the defaults in W/D/WindowMaker, as these are the one users have been used to. Some of the paths in IconPath and PixmapPath have been removed. In particular, the various system pixmap paths (/usr/include/X11/pixmaps, /usr/share/pixmaps, and /usr/local/share/pixmaps) have been removed in favor of PIXMAPDIR, which is specified by the user at build. Also, /usr/share/icons has been removed from IconPath. The root of this directory will contain very few icons, as the icons themselves are located in subdirectories corresponding to XDG icon themes. We add a comment to src/defaults.c to remind future developers who add or remove options to change the default values in both locations. We also take the opportunity to remove the unused DEF_INFO_TEXT_FONT macro.
26 lines
836 B
Makefile
26 lines
836 B
Makefile
defsdata_DATA = WMRootMenu WMWindowAttributes WindowMaker WMState WMGLOBAL
|
|
|
|
wpexecbindir = @wprefs_bindir@
|
|
|
|
EXTRA_DIST = WMGLOBAL WMWindowAttributes.in WindowMaker.in WMState.in
|
|
|
|
CLEANFILES = WMWindowAttributes WindowMaker WMState WMRootMenu
|
|
|
|
WMWindowAttributes: $(srcdir)/WMWindowAttributes.in
|
|
$(AM_V_GEN)sed -e "s:#extension#:@ICONEXT@:" \
|
|
$(srcdir)/WMWindowAttributes.in > WMWindowAttributes ; \
|
|
chmod 644 WMWindowAttributes
|
|
|
|
WindowMaker: $(srcdir)/WindowMaker.in
|
|
$(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" \
|
|
-e "s:#pixmapdir#:$(pixmapdir):" $(srcdir)/WindowMaker.in \
|
|
> WindowMaker ; \
|
|
chmod 644 WindowMaker
|
|
|
|
WMState: $(srcdir)/WMState.in
|
|
$(AM_V_GEN)sed -e "s:#wprefs#:$(wpexecbindir)/WPrefs:" $(srcdir)/WMState.in > WMState ; \
|
|
chmod 644 WMState
|
|
|
|
WMRootMenu: ./../plmenu
|
|
$(AM_V_GEN)cp -f ./../plmenu WMRootMenu
|