← Back to branch summary

~ubuntu-branches/ubuntu/trusty/freeipa/trusty-proposed

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2013-09-03 17:13:27 UTC
  • Revision ID: package-import@ubuntu.com-20130903171327-a47t1segjij5yjez
Tags: 3.3.4-0ubuntu1
Merge from unreleased debian git.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
50
50
LINT_OPTIONS=--no-fail
51
51
endif
52
52
 
53
 
PYTHON ?= $(shell rpm -E %__python)
 
53
PYTHON ?= $(shell rpm -E %__python || echo /usr/bin/python)
54
54
 
55
55
# Uncomment to increase Java stack size for Web UI build in case it fails
56
56
# because of stack overflow exception. Default should be OK for most platforms.
90
90
        done
91
91
        cd install/po && $(MAKE) install || exit 1;
92
92
        if [ "$(DESTDIR)" = "" ]; then \
93
 
                $(PYTHON) setup-client.py install; \
 
93
                $(PYTHON) setup-client.py install --install-layout=deb; \
94
94
        else \
95
 
                $(PYTHON) setup-client.py install --root $(DESTDIR); \
 
95
                $(PYTHON) setup-client.py install --install-layout=deb --root $(DESTDIR); \
96
96
        fi
97
97
 
98
98
client-dirs:
106
106
 
107
107
lint: bootstrap-autogen
108
108
        ./make-lint $(LINT_OPTIONS)
109
 
        $(MAKE) -C install/po validate-src-strings
 
109
#       $(MAKE) -C install/po validate-src-strings
110
110
 
111
111
 
112
112
test:
113
 
        ./make-testcert
 
113
#       ./make-testcert
114
114
        ./make-test
115
115
 
116
116
release-update:
158
158
        if [ "$(DESTDIR)" = "" ]; then \
159
159
                $(PYTHON) setup.py install; \
160
160
        else \
161
 
                $(PYTHON) setup.py install --root $(DESTDIR); \
 
161
                $(PYTHON) setup.py install --root $(DESTDIR) --install-layout=deb; \
162
162
        fi
163
163
 
164
164
tests: version-update tests-man-autogen