diff options
| author | John Sonnenschein <johns@joyent.com> | 2012-11-07 22:04:45 +0000 |
|---|---|---|
| committer | John Sonnenschein <johns@joyent.com> | 2012-11-07 22:04:45 +0000 |
| commit | ad2a40e16d2bee59cfe84f89db3ce92b9f15adff (patch) | |
| tree | bc8e23c4588b29e4602a54b72dbe2f1d8786468d /usr/src/tools/Makefile.python | |
| parent | b5f683274309a9c6f46eea8ce5d0cca514d977a8 (diff) | |
| parent | 7c45eec5760d4195b6b85770e7ac51c380adfb8a (diff) | |
| download | illumos-joyent-ad2a40e16d2bee59cfe84f89db3ce92b9f15adff.tar.gz | |
Illumos sync
Diffstat (limited to 'usr/src/tools/Makefile.python')
| -rw-r--r-- | usr/src/tools/Makefile.python | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/usr/src/tools/Makefile.python b/usr/src/tools/Makefile.python index a68ff026f6..dcf7c06360 100644 --- a/usr/src/tools/Makefile.python +++ b/usr/src/tools/Makefile.python @@ -63,43 +63,34 @@ PYFILES = $(PYSRCS) $(PYOBJS) -ROOTPYDIR_24 = $(PYTOPDIR)/python2.4/$(PYMODDIR) -ROOTPYFILES_24 = $(PYFILES:%=$(ROOTPYDIR_24)/%) - ROOTPYDIR_26 = $(PYTOPDIR)/python2.6/$(PYMODDIR) ROOTPYFILES_26 = $(PYFILES:%=$(ROOTPYDIR_26)/%) -ROOTPYFILES = $(ROOTPYFILES_24) $(ROOTPYFILES_26) +ROOTPYFILES = $(ROOTPYFILES_26) $(ROOTPYFILES) := FILEMODE = 0444 -PYVERSDIRS = python2.4 python2.6 - -PY24OBJS = $(PYOBJS:%=python2.4/%) -$(PY24OBJS) := PYTHON = $(PYTHON_24) +PYVERSDIRS = python2.6 PY26OBJS = $(PYOBJS:%=python2.6/%) $(PY26OBJS) := PYTHON = $(PYTHON_26) -PYVERSOBJS = $(PY24OBJS) $(PY26OBJS) +PYVERSOBJS = $(PY26OBJS) CLOBBERFILES += $(PYVERSOBJS) CLOBBERDIRS += $(PYVERSDIRS) .KEEP_STATE: -python2.4/%.pyc python2.6/%.pyc: %.py +python2.6/%.pyc: %.py @[ -d $(@D) ] || mkdir $(@D) $(RM) $@ $(PYTHON) -mpy_compile $< $(MV) $(*).pyc $@ -$(ROOTPYDIR_24)/%.pyc: python2.4/%.pyc - $(INS.pyfile) - $(ROOTPYDIR_26)/%.pyc: python2.6/%.pyc $(INS.pyfile) -$(ROOTPYDIR_24)/%.py $(ROOTPYDIR_26)/%.py: %.py +$(ROOTPYDIR_26)/%.py: %.py $(INS.pyfile) pyclobber: |