6bb0eff02e
gnome1-dirs and gnome2-dirs): - Introduce a global USE_DIRS variable, which takes pairs of names and versions. For example, an xdg-1.1 value will request the use of the xdg-dirs package, at least version 1.1. This variable must always be appended to. If there are duplicates with different versions, the one with the higher number will be picked up. - Introduce the mk/dirs.mk file, which is automatically included by bsd.pkg.mk when USE_DIRS is not empty. It parses the variable's value and includes the required dirs.mk files, present in each -dirs package. - For each -dirs package, add a dirs.mk file that defines a variable holding the list of directories provided by it, adds a dependency on that package, and modifies the PRINT_PLIST_AWK variable to output comments for the directories handled by it. - Drop some Makefile.common files that only make things difficult and more confusing now (in favour of the new dirs.mk files). The only thing to worry about is to keep version numbers consistent across xdg-* and gnome*-* packages, but that will be easier to handle. The main reason for this change is to be able to modify PRINT_PLIST_AWK in a clean way, but I hope this will improve clarity too. Also, this simplifies the addition of future -dirs packages (if needed) in a consistent way.
30 lines
878 B
Makefile
30 lines
878 B
Makefile
# $NetBSD: dirs.mk,v 1.1 2004/04/14 15:26:41 jmmv Exp $
|
|
#
|
|
# This file is intended to be included by mk/dirs.mk, not directly by packages.
|
|
#
|
|
|
|
.if !defined(DIRS_GNOME2_MK)
|
|
DIRS_GNOME2_MK= # defined
|
|
|
|
_USE_XDG_DIRS= 1.1
|
|
.include "../../misc/xdg-dirs/dirs.mk"
|
|
.include "../../misc/gnome-dirs/dirs.mk"
|
|
|
|
GNOME2_DIRS= share/control-center-2.0
|
|
GNOME2_DIRS+= share/control-center-2.0/capplets
|
|
GNOME2_DIRS+= share/control-center-2.0/icons
|
|
GNOME2_DIRS+= share/gnome-2.0
|
|
GNOME2_DIRS+= share/gnome-2.0/ui
|
|
GNOME2_DIRS+= share/gnome/wm-properties
|
|
|
|
.if defined(_USE_GNOME2_DIRS) && !empty(_USE_GNOME2_DIRS)
|
|
DEPENDS+= gnome2-dirs>=${_USE_GNOME2_DIRS}:../../misc/gnome2-dirs
|
|
|
|
. for dir in ${GNOME_DIRS} ${GNOME2_DIRS}
|
|
PRINT_PLIST_AWK+= /^@dirrm ${dir:S|/|\\/|g}$$/ \
|
|
{ print "@comment in gnome2-dirs: " $$0; next; }
|
|
. endfor
|
|
. undef dir
|
|
.endif
|
|
|
|
.endif # !defined(DIRS_GNOME2_MK)
|