Fix build in separate builddir

vbwagner · vbwagner · commit 26eaf1f9dffd · 2017-08-29T14:57:27.000+03:00
diff --git a/src/pgpro-upgrade/Makefile b/src/pgpro-upgrade/Makefile
@@ -14,11 +14,11 @@ include $(top_builddir)/src/Makefile.global
 srcdir=$(top_srcdir)/$(subdir)
 
 all:
-	$(PERL) setver.pl $(top_srcdir) $(top_builddir)
+	$(PERL) $(srcdir)/setver.pl $(top_srcdir) $(top_builddir)
 	chmod 0755 pgpro_upgrade
 
-install: installdirs
-	$(INSTALL_PROGRAM) $(srcdir)/pgpro_upgrade '$(DESTDIR)$(bindir)/pgpro_upgrade'
+install: installdirs 
+	$(INSTALL_PROGRAM) pgpro_upgrade '$(DESTDIR)$(bindir)/pgpro_upgrade'
 	$(INSTALL_DATA) $(srcdir)/*.sql $(srcdir)/*.test '$(DESTDIR)$(datadir)/pgpro-upgrade'
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(bindir)'
diff --git a/src/pgpro-upgrade/pgpro_upgrade b/src/pgpro-upgrade/pgpro_upgrade
@@ -28,7 +28,7 @@ case "$PGBIN" in
 esac
 
 # Check the catalog version
-CATALOG_VERSION_NO=2016081311
+CATALOG_VERSION_NO=2016081315
 MAJORVER=9.6
 CATVER=`${PGBIN}pg_controldata|sed -n '/Catalog version number:/s/^.*: *//p'`
 if [ "$CATVER" != $CATALOG_VERSION_NO ]; then
