Skip to content

Commit 366525e

Browse files
committed
locale's 'make template' now works without having to do a build first.
Remove need for build to be done. Use ../roundup for everything rather than ../build/lib. The .pot file generated this way was compared against the previuos method and they produced the same .pot file. This makes step 1 in RELEASE.txt actually work the way it says.
1 parent d58cebf commit 366525e

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

locale/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ PACKAGES=$(shell find ../roundup ../share/roundup/templates -name '*.py' \
1515
SOURCES=$(PACKAGES:=/*.py)
1616
PO_FILES=$(wildcard *.po)
1717
MO_FILES=$(PO_FILES:.po=.mo)
18-
PYTHON_BUILD=../build/lib
19-
RUN_PYTHON=PYTHONPATH=$(PYTHON_BUILD) $(PYTHON) -O
18+
RUN_PYTHON=PYTHONPATH=.. $(PYTHON) -O
2019

2120
all: dist
2221

@@ -41,7 +40,6 @@ dist:
4140
done
4241

4342
template:
44-
test -d $(PYTHON_BUILD) || (echo "Missing build directory $(PYTHON_BUILD). ln -s lib to build library"; exit 1)
4543
${XPOT} -n -o $(TEMPLATE) $(SOURCES)
4644

4745
${RUN_PYTHON} ../roundup/cgi/TAL/talgettext.py -u $(TEMPLATE) \
@@ -50,7 +48,7 @@ template:
5048
../share/roundup/templates/minimal/html/*.html \
5149
../share/roundup/templates/responsive/html/*.html
5250
VERSION="`sed -ne \"/__version__/s/.*'\(.*\)'.*/\1/p\" \
53-
../build/lib/roundup/__init__.py`"; \
51+
../roundup/__init__.py`"; \
5452
${XGETTEXT} -j -w 80 -F \
5553
--package-name=Roundup \
5654
--package-version=$$VERSION \

0 commit comments

Comments
 (0)