[Git][freetype/freetype][master] autogen.sh: Only copy submodules if building from a git branch.

[Werner Lemberg (@wl)]

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

• 467e49e8
  by Hugh McMaster at 2021-10-05T19:44:27+02:00

  autogen.sh: Only copy submodules if building from a git branch.
  
  `autogen.sh` fails if building from a standard source tarball.  Firstly, git
  expects to be called in a git repository, then `copy_submodule_files`
  blindly attempts to copy files.
  
  Debian, Ubuntu, Linux Mint, and other derivatives all run `autogen.sh`
  before compiling to regenerate build files.
  
  This patch ensures that various git commands are only called and 'dlg' files
  are only copied if `autogen.sh` is called from a git repository.
  

1 changed file:

• autogen.sh

Changes:

autogen.sh

---

...	...	@@ -182,17 +182,19 @@ copy_submodule_files ()
182	182	cp $DLG_SRC_DIR/* src/dlg
183	183	}
184	184
185		-DLG_INC_DIR=subprojects/dlg/include/dlg
186		-DLG_SRC_DIR=subprojects/dlg/src/dlg
	185	+if test -d ".git"; then
	186	+ DLG_INC_DIR=subprojects/dlg/include/dlg
	187	+ DLG_SRC_DIR=subprojects/dlg/src/dlg
187	188
188		-if test -d "$DLG_INC_DIR"; then
189		- :
190		-else
191		- echo "Checking out submodule in \`subprojects/dlg':"
192		- git submodule init
193		- git submodule update
194		-fi
	189	+ if test -d "$DLG_INC_DIR"; then
	190	+ :
	191	+ else
	192	+ echo "Checking out submodule in \`subprojects/dlg':"
	193	+ git submodule init
	194	+ git submodule update
	195	+ fi
195	196
196		-copy_submodule_files
	197	+ copy_submodule_files
	198	+fi
197	199
198	200	# EOF

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings.