projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
psppire-import: fixed bug with short csv file import
[pspp]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 0d40442dd888285d24b7b440ec9a885a3962bf3c..f7050f9f1aca742a63608280435dcc1083eb040f 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-19,7
+19,7
@@
AUTOMAKE_OPTIONS = std-options check-news 1.10.1 subdir-objects
SUBDIRS = gl po
AUTOMAKE_OPTIONS = std-options check-news 1.10.1 subdir-objects
SUBDIRS = gl po
-DISTCLEANFILES = ./po/stamp-po xconfigure
+DISTCLEANFILES = ./po/stamp-po xconfigure
BUILT_SOURCES =
AM_CPPFLAGS = \
BUILT_SOURCES =
AM_CPPFLAGS = \
@@
-48,7
+48,7
@@
pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
EXTRA_DIST = ONEWS pspp-mode.el
EXTRA_DIST = ONEWS pspp-mode.el
-CLEANFILES =
+CLEANFILES =
CLEAN_LOCAL =
ALL_LOCAL =
CHECK_LOCAL =
CLEAN_LOCAL =
ALL_LOCAL =
CHECK_LOCAL =
@@
-60,7
+60,7
@@
check_PROGRAMS=
bin_PROGRAMS=
dist_man_MANS =
DIST_HOOKS =
bin_PROGRAMS=
dist_man_MANS =
DIST_HOOKS =
-INSTALL_DATA_HOOKS =
+INSTALL_DATA_HOOKS =
UNINSTALL_DATA_HOOKS =
PHONY =
SUFFIXES = .q
UNINSTALL_DATA_HOOKS =
PHONY =
SUFFIXES = .q
@@
-129,9
+129,14
@@
programs: $(PROGRAMS)
# If we're checked out from a Git repository, make sure that every
# file that is in Git is distributed.
# If we're checked out from a Git repository, make sure that every
# file that is in Git is distributed.
+# The debian package is now also maintained in git and that contains
+# the distribution files. Do not run this check if we are
+# in a debian package git repository, because the check fails there
ALL_LOCAL += dist-hook-git
dist-hook-git: distfiles
ALL_LOCAL += dist-hook-git
dist-hook-git: distfiles
- @if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1; then \
+ @if test -e $(srcdir)/.git && \
+ test ! -d $(srcdir)/debian && \
+ (git --version) >/dev/null 2>&1; then \
(cd $(srcdir) && git ls-files) \
| grep -vE '\.gitignore|README.Git|Smake|Bug-administration' \
| LC_ALL=C sort -u > gitfiles; \
(cd $(srcdir) && git ls-files) \
| grep -vE '\.gitignore|README.Git|Smake|Bug-administration' \
| LC_ALL=C sort -u > gitfiles; \