DeforaOS/configure
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Default "make distcheck" to using OBJDIR and testing (un)installation to DESTDIR

Browse Source
This commit is contained in:
Pierre Pronchery 2014-10-31 18:10:32 +01:00
parent 35c5278d8a
commit ab6c01a9bf
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/makefile.c
View File

@ -1671,6 +1671,16 @@ static int _write_distcheck(Configure * configure, FILE * fp)
{ {
String const * package; String const * package;
String const * version; String const * version;
const char pretarget[] = "\ndistcheck: dist\n"
"\t$(TAR) -xzvf $(PACKAGE)-$(VERSION).tar.gz\n"
"\t$(MKDIR) -- $(PACKAGE)-$(VERSION)/objdir\n"
"\t$(MKDIR) -- $(PACKAGE)-$(VERSION)/destdir\n";
const char target[] = "\t(cd \"$(PACKAGE)-$(VERSION)\" && $(MAKE) OBJDIR=\"$$PWD/objdir/\")\n"
"\t(cd \"$(PACKAGE)-$(VERSION)\" && $(MAKE) OBJDIR=\"$$PWD/objdir/\" DESTDIR=\"$$PWD/destdir\" install)\n"
"\t(cd \"$(PACKAGE)-$(VERSION)\" && $(MAKE) OBJDIR=\"$$PWD/objdir/\" DESTDIR=\"$$PWD/destdir\" uninstall)\n"
"\t(cd \"$(PACKAGE)-$(VERSION)\" && $(MAKE) OBJDIR=\"$$PWD/objdir/\" distclean)\n"
"\t(cd \"$(PACKAGE)-$(VERSION)\" && $(MAKE) dist)\n";
const char posttarget[] = "\t$(RM) -r -- $(PACKAGE)-$(VERSION)\n";
if(configure->prefs->flags & PREFS_n) if(configure->prefs->flags & PREFS_n)
return 0; return 0;
@ -1678,12 +1688,9 @@ static int _write_distcheck(Configure * configure, FILE * fp)
version = config_get(configure->config, NULL, "version"); version = config_get(configure->config, NULL, "version");
if(package == NULL || version == NULL) if(package == NULL || version == NULL)
return 0; return 0;
fputs("\ndistcheck: dist\n", fp); fputs(pretarget, fp);
fputs("\t$(TAR) -xzvf $(PACKAGE)-$(VERSION).tar.gz\n", fp); fputs(target, fp);
fputs("\t(cd \"$(PACKAGE)-$(VERSION)\" && $(MAKE))\n", fp); fputs(posttarget, fp);
fputs("\t(cd \"$(PACKAGE)-$(VERSION)\" && $(MAKE) distclean)\n", fp);
fputs("\t(cd \"$(PACKAGE)-$(VERSION)\" && $(MAKE) dist)\n", fp);
fputs("\t$(RM) -r -- $(PACKAGE)-$(VERSION)\n", fp);
return 0; return 0;
} }