Commit 3aea9ec2 authored by Jim Nelson's avatar Jim Nelson

#3114: mkunit and Makefile now handle subunits properly. Courtesy Bruno Girin.

parent 1514b4ab
......@@ -328,7 +328,7 @@ DIRECT_EDIT_DESKTOP_APPLICATION_CLASS="Photo Viewer"
TEMPORARY_DESKTOP_FILES = misc/shotwell.desktop misc/shotwell-viewer.desktop
# Process the units
UNIT_MKS := $(foreach unit,$(UNITS),src/$(unit)/mk/$(unit).mk)
UNIT_MKS := $(foreach unit,$(UNITS),src/$(unit)/mk/$(notdir $(unit)).mk)
include $(UNIT_MKS)
UNITIZE_DIR := src/.unitize
......
......@@ -14,7 +14,7 @@ fi
mkdir -p src/$1
mkdir -p src/$1/mk
m4 --define=_UNIT_DIR_=$1 --define=_UNIT_NAME_=$2 src/unit/rc/template.mk > src/$1/mk/$1.mk
m4 --define=_UNIT_DIR_=$1 --define=_UNIT_NAME_=$2 src/unit/rc/template.mk > src/$1/mk/$(basename $1).mk
m4 --define=_UNIT_NAME_=$2 src/unit/rc/Unit.m4 > src/$1/$2.vala
echo "Unit $1 must be manually added to units.mk."
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment