Allow build for Xenial in 4.0
This commit is contained in:
		
							parent
							
								
									28be709238
								
							
						
					
					
						commit
						54867b6eab
					
				
							
								
								
									
										2
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								Makefile
									
									
									
									
									
								
							@ -302,6 +302,8 @@ endif
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
ifeq ($(shell lsb_release -is), Debian)
 | 
					ifeq ($(shell lsb_release -is), Debian)
 | 
				
			||||||
	install -m 0644 misc/qubesxdg.py $(DESTDIR)/$(PYTHON2_SITELIB)/
 | 
						install -m 0644 misc/qubesxdg.py $(DESTDIR)/$(PYTHON2_SITELIB)/
 | 
				
			||||||
 | 
					else ifeq ($(shell lsb_release -is), Ubuntu)
 | 
				
			||||||
 | 
						install -m 0644 misc/qubesxdg.py $(DESTDIR)/$(PYTHON2_SITELIB)/
 | 
				
			||||||
else
 | 
					else
 | 
				
			||||||
	install -m 0644 misc/py2/qubesxdg.py* $(DESTDIR)/$(PYTHON2_SITELIB)/
 | 
						install -m 0644 misc/py2/qubesxdg.py* $(DESTDIR)/$(PYTHON2_SITELIB)/
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
 | 
				
			|||||||
@ -15,6 +15,11 @@ source-debian-quilt-copy-in:
 | 
				
			|||||||
	if [ $(DIST) == trusty ] ; then \
 | 
						if [ $(DIST) == trusty ] ; then \
 | 
				
			||||||
		sed -i /locales-all/d $(CHROOT_DIR)/$(DIST_SRC)/debian/control ;\
 | 
							sed -i /locales-all/d $(CHROOT_DIR)/$(DIST_SRC)/debian/control ;\
 | 
				
			||||||
	fi
 | 
						fi
 | 
				
			||||||
 | 
						if [ $(DIST) == xenial ] ; then \
 | 
				
			||||||
 | 
							sed -i /avahi-daemon.service.d/d $(CHROOT_DIR)/$(DIST_SRC)/debian/qubes-core-agent.install;\
 | 
				
			||||||
 | 
							sed -i /exim4/d $(CHROOT_DIR)/$(DIST_SRC)/debian/qubes-core-agent.install;\
 | 
				
			||||||
 | 
							sed -i /netfilter-persistent/d $(CHROOT_DIR)/$(DIST_SRC)/debian/qubes-core-agent.install;\
 | 
				
			||||||
 | 
						fi
 | 
				
			||||||
	if [ $(DIST) == zesty ] ; then \
 | 
						if [ $(DIST) == zesty ] ; then \
 | 
				
			||||||
		sed -i /initscripts/d $(CHROOT_DIR)/$(DIST_SRC)/debian/control ;\
 | 
							sed -i /initscripts/d $(CHROOT_DIR)/$(DIST_SRC)/debian/control ;\
 | 
				
			||||||
	fi
 | 
						fi
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user