unbreak the build
This commit is contained in:
parent
78f5f2204d
commit
acdd5287a9
3
Makefile
3
Makefile
|
@ -42,7 +42,8 @@ dist: distclean
|
|||
# Only copy source code from i3-input
|
||||
mkdir i3-${VERSION}/i3-input
|
||||
find i3-input -maxdepth 1 -type f \( -name "*.c" -or -name "*.mk" -or -name "*.h" -or -name "Makefile" \) -exec cp '{}' i3-${VERSION}/i3-input \;
|
||||
echo -n ${I3_VERSION} > i3-${VERSION}/VERSION
|
||||
echo -n ${I3_VERSION} > i3-${VERSION}/I3_VERSION
|
||||
echo -n ${VERSION} > i3-${VERSION}/VERSION
|
||||
# Pre-generate a manpage to allow distributors to skip this step and save some dependencies
|
||||
$(MAKE) mans
|
||||
cp man/*.1 i3-${VERSION}/man/
|
||||
|
|
|
@ -15,12 +15,12 @@ ifndef SYSCONFDIR
|
|||
endif
|
||||
endif
|
||||
|
||||
I3_VERSION := '$(shell [ -f $(TOPDIR)/VERSION ] && cat $(TOPDIR)/VERSION)'
|
||||
# In dist tarballs, the version is stored in the I3_VERSION and VERSION files.
|
||||
I3_VERSION := '$(shell [ -f $(TOPDIR)/I3_VERSION ] && cat $(TOPDIR)/I3_VERSION)'
|
||||
VERSION := '$(shell [ -f $(TOPDIR)/VERSION ] && cat $(TOPDIR)/VERSION)'
|
||||
ifeq ('',$(I3_VERSION))
|
||||
VERSION := $(shell git describe --tags --abbrev=0)
|
||||
I3_VERSION := '$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1), branch \"$(shell git describe --tags --always --all | sed s:heads/::)\")'
|
||||
else
|
||||
VERSION := ${I3_VERSION}
|
||||
endif
|
||||
|
||||
MAJOR_VERSION := $(shell echo ${VERSION} | cut -d '.' -f 1)
|
||||
|
|
Loading…
Reference in New Issue