Skip to content

Commit

Permalink
build: Use DATADIR to match local_settings.sh
Browse files Browse the repository at this point in the history
Signed-off-by: Lon Hohberger <lhh@redhat.com>
  • Loading branch information
lhh committed Feb 16, 2017
1 parent 2c9ffec commit b63de70
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TARGETS?=os-ovs os-swift os-nova os-neutron os-mysql os-glance os-rsync os-rabbitmq os-keepalived os-keystone os-haproxy os-mongodb os-ipxe os-redis os-cinder
MODULES?=${TARGETS:=.pp.bz2}
SHAREDIR?=/usr/share
DATADIR?=/usr/share
#INSTALL=?=install

all: ${TARGETS:=.pp.bz2}
Expand All @@ -10,7 +10,7 @@ all: ${TARGETS:=.pp.bz2}
bzip2 -9 $^

%.pp: %.te
make -f ${SHAREDIR}/selinux/devel/Makefile $@
make -f ${DATADIR}/selinux/devel/Makefile $@

clean:
rm -f *~ *.if *.tc *.pp *.pp.bz2
Expand Down Expand Up @@ -61,5 +61,5 @@ local-tarball: .git/config

#install:
# ${INSTALL} -m 0644 ${TARGETS} \
# ${DESTDIR}${SHAREDIR}/targeted/modules
# ${DESTDIR}${DATADIR}/targeted/modules

0 comments on commit b63de70

Please sign in to comment.